From 012e8abffab468c2f31518cfe029bbc5936c3d6e Mon Sep 17 00:00:00 2001
From: Thomas Hackl <hackl@data-quest.de>
Date: Sat, 15 Jul 2023 14:27:51 +0000
Subject: [PATCH] Resolve "Migration 5.4.6_tree_changes.php"

Closes #2880

Merge request studip/studip!1943
---
 db/migrations/5.4.6_tree_changes.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/db/migrations/5.4.6_tree_changes.php b/db/migrations/5.4.6_tree_changes.php
index 94d015caed9..146a77ae643 100644
--- a/db/migrations/5.4.6_tree_changes.php
+++ b/db/migrations/5.4.6_tree_changes.php
@@ -41,19 +41,15 @@ final class TreeChanges extends Migration
     {
         // Restore config entries to their defaults.
         DBManager::get()->exec("INSERT IGNORE INTO `config`
-                ( `config_id` , `parent_id` , `field` , `value` ,
-                 `is_default` , `type` , `range` , `section` ,
-                  `position` , `mkdate` , `chdate` , `description` ,
-                   `comment` , `message_template` )
+                ( `field`, `value`, `type`, `range`, `section`, `mkdate`, `chdate`, `description`)
                 VALUES (
-                MD5( 'RANGE_TREE_ADMIN_PERM' ) , '', 'RANGE_TREE_ADMIN_PERM',
-                 'admin', '1', 'string', 'global', '', '0',
-                  UNIX_TIMESTAMP( ) , UNIX_TIMESTAMP( ) ,
-                   'mit welchem Status darf die Einrichtungshierarchie bearbeitet werden (admin oder root)', '', ''
+                    'RANGE_TREE_ADMIN_PERM', 'root', 'string', 'global', 'permissions',
+                    UNIX_TIMESTAMP(), UNIX_TIMESTAMP(),
+                    'mit welchem Status darf die Einrichtungshierarchie bearbeitet werden (admin oder root)'
                 ), (
-                MD5( 'SEM_TREE_ADMIN_PERM' ) , '', 'SEM_TREE_ADMIN_PERM',
-                 'admin', '1', 'string', 'global', '', '0', UNIX_TIMESTAMP( ) ,
-                  UNIX_TIMESTAMP( ) , 'mit welchem Status darf die Veranstaltungshierarchie bearbeitet werden (admin oder root)', '', ''
+                    'SEM_TREE_ADMIN_PERM', 'root', 'string', 'global', 'permissions',
+                    UNIX_TIMESTAMP(), UNIX_TIMESTAMP() ,
+                    'mit welchem Status darf die Veranstaltungshierarchie bearbeitet werden (admin oder root)'
                 )");
 
         // Add database column for sem_tree institute assignments.
-- 
GitLab