Changeset 894 for trunk/Modules/User

Timestamp:

Jan 5, 2021, 10:30:31 PM (4 years ago)

Author:

chronos

Message:

• Modified: Further improved models initialization system.

Location:

trunk/Modules/User

Files:

• User.php (modified) (1 diff)
• UserModel.php (modified) (6 diffs)

trunk/Modules/User/User.php

@@ -25 +25 @@
   function GetModels(): array
   {
-    return array('User', 'UserOnline', 'PermissionGroup', 'PermissionOperation', 'PermissionGroupAssignment', 'PermissionUserAssignment');
+    return array(User::GetClassName(), UserOnline::GetClassName(), PermissionGroup::GetClassName(), PermissionOperation::GetClassName(),
+      PermissionGroupAssignment::GetClassName(), PermissionUserAssignment::GetClassName());
   }
 

trunk/Modules/User/UserModel.php

@@ -67 +67 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('User');
+    $Desc = new ModelDesc(self::GetClassName());
     $Column = $Desc->AddString('Login');
     $Column->Unique = true;
@@ -458 +458 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('UserOnline');
+    $Desc = new ModelDesc(self::GetClassName());
     $Desc->Memory = true;
-    $Desc->AddReference('User', 'User', true);
+    $Desc->AddReference('User', User::GetClassName(), true);
     $Desc->AddDateTime('ActivityTime');
     $Desc->AddDateTime('LoginTime');
@@ -477 +477 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('PermissionGroup');
+    $Desc = new ModelDesc(self::GetClassName());
     $Desc->AddString('Description');
     return $Desc;
@@ -487 +487 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('PermissionGroupAssignment');
-    $Desc->AddReference('Group', 'PermissionGroup');
-    $Desc->AddReference('AssignedGroup', 'PermissionGroup', true);
-    $Desc->AddReference('AssignedOperation', 'PermissionOperation', true);
+    $Desc = new ModelDesc(self::GetClassName());
+    $Desc->AddReference('Group', PermissionGroup::GetClassName());
+    $Desc->AddReference('AssignedGroup', PermissionGroup::GetClassName(), true);
+    $Desc->AddReference('AssignedOperation', PermissionOperation::GetClassName(), true);
     return $Desc;
   }
@@ -499 +499 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('PermissionOperation');
-    $Desc->AddReference('Module', 'Module');
+    $Desc = new ModelDesc(self::GetClassName());
+    $Desc->AddReference('Module', Module::GetClassName());
     $Desc->AddString('Operation');
     $Desc->AddString('Item');
@@ -513 +513 @@
   static function GetDesc(): ModelDesc
   {
-    $Desc = new ModelDesc('PermissionUserAssignment');
-    $Desc->AddReference('User', 'User');
-    $Desc->AddReference('AssignedGroup', 'PermissionGroup', true);
-    $Desc->AddReference('AssignedOperation', 'PermissionOperation', true);
+    $Desc = new ModelDesc(self::GetClassName());
+    $Desc->AddReference('User', User::GetClassName());
+    $Desc->AddReference('AssignedGroup', PermissionGroup::GetClassName(), true);
+    $Desc->AddReference('AssignedOperation', PermissionOperation::GetClassName(), true);
     return $Desc;
   }