Changeset 900 for trunk/Packages/Common/Modules

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/Modules

Files:

• ModuleManager.php (modified) (1 diff)
• Setup.php (modified) (3 diffs)

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();
         }