Changeset 900 for trunk/Packages/Common

Timestamp:

Feb 17, 2021, 5:15:29 PM (4 years ago)

Author:

chronos

Message:

• Modified: Insert sample data action partially implemented.

Location:

trunk/Packages/Common

Files:

• Database.php (modified) (1 diff)
• Module.php (modified) (3 diffs)
• ModuleManager.php (modified) (2 diffs)
• Modules/ModuleManager.php (modified) (1 diff)
• Modules/Setup.php (modified) (3 diffs)

trunk/Packages/Common/Database.php

@@ -134 +134 @@
   }
 
-  function insert(string $Table, array $Data): void
+  function insert(string $Table, array $Data): int
   {
     $this->query($this->GetInsert($Table, $Data));
     $this->insert_id = $this->PDO->lastInsertId();
+    return $this->insert_id;
   }
 

trunk/Packages/Common/Module.php

@@ -17 +17 @@
   const Enable = 5;
   const Disable = 6;
+  const InsertSampleData = 7;
 }
 
@@ -141 +142 @@
   }
 
+  function InsertSampleData(): void
+  {
+    $this->DoInsertSampleData();
+  }
+
   function Reinstall(): void
   {
@@ -224 +230 @@
   }
 
+  protected function DoInsertSampleData(): void
+  {
+  }
+
   function AddModel(Model $Model): void
   {

trunk/Packages/Common/ModuleManager.php

@@ -57 +57 @@
           if ($Action == ModuleAction::Disable) $Module->Disable();
           if ($Action == ModuleAction::Upgrade) $Module->Upgrade();
+          if ($Action == ModuleAction::InsertSampleData) $Module->InsertSampleData();
         }
       }
@@ -227 +228 @@
   function RegisterModule(Module $Module): void
   {
+    if (array_key_exists($Module->Name, $this->Modules))
+      die('Can\'t register module '.$Module->Name.' because it already exists.');
     $this->Modules[$Module->Name] = &$Module;
     $Module->Manager = &$this;

trunk/Packages/Common/Modules/ModuleManager.php

@@ -260 +260 @@
       $ModelId = $DbRow['Id'];
       $DbResult = $this->Database->delete('ModelField', '(Model='.$ModelId.')');
-    }
-    $this->Database->delete('Model', '(Id='.$ModelId.')');
+      $this->Database->delete('Model', '(Id='.$ModelId.')');
+    } else echo('Can\'t remove model '.$ModelDesc->Name.'<br/>');
     $this->RemoveModelDatabase($ModelDesc);
   }

trunk/Packages/Common/Modules/Setup.php

@@ -59 +59 @@
     $Output = $this->UpdateManager->Upgrade();
     return $Output;
-  }
-
-  function InsertSampleData(): void
-  {
   }
 }
@@ -81 +77 @@
     $this->FullTitle = T('Application setup');
     $this->ShortTitle = T('Application setup');
-    //$this->ParentClass = 'PagePortal';
+    //$this->ParentClass = 'PageSetupRedirect';
     $this->ConfigDir = dirname(dirname(dirname(__FILE__))).'/Config';
     $this->YesNo = array(false => T('No'), true => T('Yes'));
@@ -212 +208 @@
         {
           $Output .= '<h3>Vložení vzorových dat</h3>';
-          ModuleSetup::Cast($this->System->GetModule('Setup'))->InsertSampleData();
+          $this->System->ModuleManager->Perform(array(ModuleAction::InsertSampleData), array(ModuleCondition::Installed));
           $Output .= $this->ControlPanel();
         }