Changeset 934 for trunk

Timestamp:

May 11, 2022, 10:07:18 PM (3 years ago)

Author:

chronos

Message:

• Added: System names for Permission groups.

Location:

trunk

Files:

• Application/UpdateTrace.php (modified) (2 diffs)
• Application/Version.php (modified) (1 diff)
• Modules/User/UserModel.php (modified) (2 diffs)
• Packages/Common/ModelDesc.php (modified) (1 diff)
• Packages/Common/Modules/ModuleManager.php (modified) (1 diff)

trunk/Application/UpdateTrace.php

@@ -2207 +2207 @@
         "VALUES (NULL , 'Fyzické adresy', ".$DbRow['Id'].", '".$ActionId."', '1');");
   }
+}
+
+function UpdateTo933(UpdateManager $Manager): void
+{
+  $Manager->Execute('ALTER TABLE `PermissionGroup` ADD `SysName` VARCHAR(255) NULL DEFAULT "" AFTER `Description`;');
+  $Manager->Execute('UPDATE `PermissionGroup` SET `SysName`="admins" WHERE `Description`="Systémoví administrátoři"');
+  $Manager->Execute('UPDATE `PermissionGroup` SET `SysName`="network-admins" WHERE `Description`="Správci sítě"');
+  $Manager->Execute('UPDATE `PermissionGroup` SET `SysName`="registered-users" WHERE `Description`="Registrovaní uživatelé"');
+  $Manager->Execute('UPDATE `PermissionGroup` SET `SysName`="other-users" WHERE `Description`="Ostatní"');
+  $Manager->Execute('UPDATE `PermissionGroup` SET `SysName`="customers" WHERE `Description`="Zákazníci"');
 }
 
@@ -2317 +2327 @@
       907 => array('Revision' => 911, 'Function' => 'UpdateTo911'),
       911 => array('Revision' => 921, 'Function' => 'UpdateTo921'),
+      921 => array('Revision' => 933, 'Function' => 'UpdateTo933'),
     );
   }

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 922; // Subversion revision
-$DatabaseRevision = 921; // SQL structure revision
-$ReleaseTime = strtotime('2022-02-28');
+$Revision = 933; // Subversion revision
+$DatabaseRevision = 933; // SQL structure revision
+$ReleaseTime = strtotime('2022-05-11');

trunk/Modules/User/UserModel.php

@@ -173 +173 @@
               'Locked' => 1));
             $UserId = $this->Database->insert_id;
+            $PermissionGroup = new PermissionGroup($this->System);
             $this->Database->insert('PermissionUserAssignment', array('User' => $UserId,
-              'AssignedGroup' => 2));
+              'AssignedGroup' => $PermissionGroup->GetItemBySysName('registered-users')));
 
             $NewPassword = substr(sha1(strtoupper($Login)), 0, 7);
@@ -484 +485 @@
     $Desc = new ModelDesc(self::GetClassName());
     $Desc->AddString('Description');
+    $Desc->AddString('SysName');
+    $Desc->DefaultValuesMethod = 'GetDefaultValues';
     return $Desc;
+  }
+
+  static function GetDefaultValues(): array
+  {
+    return array(
+      array('Id' => 1, 'Description' => 'Ostatní uživatelé', 'SysName' => 'other-users'),
+      array('Id' => 2, 'Description' => 'Registrovaní uživatelé', 'SysName' => 'registered-users'),
+      array('Id' => 3, 'Description' => 'Správci', 'SysName' => 'admins'),
+    );
+  }
+
+  function GetItemBySysName(string $Name): int
+  {
+    $DbResult = $this->Database->select('PermissionGroup', 'Id', '`SysName`="'.$Name.'"');
+    if ($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      return $DbRow['Id'];
+    } else return 0;
   }
 }

trunk/Packages/Common/ModelDesc.php

@@ -16 +16 @@
     $this->PrimaryKey = 'Id';
     $this->Memory = false;
+    $this->DefaultValuesMethod = null;
   }
 

trunk/Packages/Common/Modules/ModuleManager.php

@@ -250 +250 @@
         'Type' => ModelColumnType::GetName($Field->Type), 'Nullable' => (int)$Field->Nullable));
     }
+    if ($ModelDesc->DefaultValues != null)
+    {
+      $Values = call_user_func('self::'.$ModelDesc->DefaultValues);
+      foreach ($Values as $Value)
+      {
+        $this->Databse->insert($ModelDesc->Name, $Value);
+      }
+    }
   }