Changeset 377 for trunk/Common/Module.php

Timestamp:

Jan 20, 2012, 3:05:24 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Testována instalace čisté databáze na základě definic modulů a jejich modelů.
• Opraveno: Doplněny definice modelů pro FinanceMonthlyOverall a FinanceCharge.
• Přidáno: Podpora pro nastavitelnost NULL hodnoty u vlastností modelů.
• Opraveno: Řešení správného kaskádového načítání závislostí modulů.

File:

• trunk/Common/Module.php (modified) (6 diffs)

trunk/Common/Module.php

@@ -27 +27 @@
   function Install()
   {
+    if($this->Installed) return;
     DebugLog('Installing module '.$this->Name.'...');
+    $this->Installed = true;
+    foreach($this->Dependencies as $Dependency)  
+      $this->System->Modules[$Dependency]->Install();
+    $this->LoadModels();
     foreach($this->Models as $ModelName)
     {
-      $Model = new $ModelName($this->Database, $this->System);
-      $Model->Module = &$this;
-      $Model->Install();
-      unset($Model);
+      $this->System->Models[$ModelName]->Install();
     }
     $this->Database->query('UPDATE SystemModule SET Installed=1 WHERE Name="'.$this->Name.'"');
@@ -52 +54 @@
   function Init()
   {
+    if($this->Initialized) return;
     $this->Initialized = true;
     foreach($this->Dependencies as $Dependency)  
-      if(!$this->System->Modules[$Dependency]->Initialized)
-        $this->System->Modules[$Dependency]->Init();
+      $this->System->Modules[$Dependency]->Init();
+  } 
+  
+  function LoadModels()
+  {
+    foreach($this->Models as $ModelName)
+    {
+      $this->System->Models[$ModelName] = new $ModelName($this->Database, $this->System);
+      $this->System->Models[$ModelName]->Module = &$this;
+    }       
   }
 }
@@ -75 +86 @@
   }
 
-  function Init($Installed = true)
+  function LoadModules($Installed = true)
   {
     $Query = 'SELECT `Id`, `Name` FROM `SystemModule`';
@@ -88 +99 @@
       $this->Modules[$Module['Name']]->Id = $Module['Id'];
     }     
+  }
+  
+  function Init()
+  {
     foreach($this->Modules as $Index => $Module)
       $this->Modules[$Index]->Init();
@@ -103 +118 @@
   `Installed` int(11) NOT NULL,
   `Description` text COLLATE utf8_czech_ci NOT NULL,
-  `Dependecies` varchar(255) COLLATE utf8_czech_ci NOT NULL,
+  `Dependencies` varchar(255) COLLATE utf8_czech_ci NOT NULL,
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
@@ -122 +137 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
     $this->ReloadList();
-    $this->Init(false);
+    $this->LoadModules(false);
     foreach($this->Modules as $Index => $Module)
     {