Changeset 899 for trunk/Modules/IS/IS.php

Timestamp:

Feb 17, 2021, 12:30:23 PM (3 years ago)

Author:

chronos

Message:

• Modified: AppModule renamed to Module. AppModuleManger renamed to ModuleManager.
• Fixed: Keep Modules Id in ModulesConfig.php in sync with database list of modules.

File:

• trunk/Modules/IS/IS.php (modified) (6 diffs)

trunk/Modules/IS/IS.php

@@ -845 +845 @@
 class Menu extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -855 +855 @@
 class MenuItem extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -868 +868 @@
 class MenuItemFavorite extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -877 +877 @@
 }
 
-class ModuleIS extends AppModule
+class ModuleIS extends Module
 {
   public array $DashboardItems;
@@ -890 +890 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'User interface for generic information system';
-    $this->Dependencies = array('User');
+    $this->Dependencies = array(ModuleUser::GetName());
+    $this->Models = array(Menu::GetClassName(), MenuItem::GetClassName(), MenuItemFavorite::GetClassName());
 
     $this->DashboardItems = array();
-  }
-
-  function GetModels(): array
-  {
-    return array(Menu::GetClassName(), MenuItem::GetClassName(), MenuItemFavorite::GetClassName());
   }
 
@@ -956 +952 @@
   }
 
-  static function Cast(AppModule $AppModule): ModuleIS
-  {
-    if ($AppModule instanceof ModuleIS)
-    {
-      return $AppModule;
-    }
-    throw new Exception('Expected ModuleIS type but '.gettype($AppModule));
+  static function Cast(Module $Module): ModuleIS
+  {
+    if ($Module instanceof ModuleIS)
+    {
+      return $Module;
+    }
+    throw new Exception('Expected ModuleIS type but '.gettype($Module));
   }
 }