Changeset 613

Timestamp:

Dec 20, 2013, 9:04:09 AM (11 years ago)

Author:

chronos

Message:

• Přidáno: Volba znovunačtení seznamu modulů v instalátoru.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/AppModule.php (modified) (1 diff)
• Common/Setup/Setup.php (modified) (5 diffs)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 612; // Subversion revision
+$Revision = 613; // Subversion revision
 $DatabaseRevision = 601; // SQL structure revision
-$ReleaseTime = '2013-12-16';
+$ReleaseTime = '2013-12-20';

trunk/Common/AppModule.php

@@ -244 +244 @@
           (!$Module->Installed and in_array(ModuleCondition::NotInstalled, $Conditions))))
       {
-        array_push($List, $DepModule);
-        $this->EnumSuperiorDependenciesCascade($DepModule, $List, $Conditions);
+        array_push($List, $RefModule);
+        $this->EnumSuperiorDependenciesCascade($RefModule, $List, $Conditions);
       }
     }

trunk/Common/Setup/Setup.php

@@ -55 +55 @@
           $Output .= '<a href="?action=upgrade">Povýšit</a> ';
         $Output .= '<a href="?action=insert_sample_data">Vložit vzorová data</a> ';
+        $Output .= '<a href="?action=reload_modules">Obnovit seznam modulů</a> ';
         $Output .= '<a href="?action=uninstall">Odinstalovat</a> ';
         $Output .= '<a href="?action=modules">Správa modulů</a> ';
@@ -103 +104 @@
           $Output .= '<h3>Instalace</h3>';
           $this->System->Setup->Install();
-          $Output .= $this->System->Setup->Upgrade();
+          $this->System->ModuleManager->LoadModules();
+          $this->System->ModuleManager->SaveState();
+          //$Output .= $this->System->Setup->Upgrade();
           $Output .= $this->ControlPanel();
         } else
@@ -110 +113 @@
           $Output .= '<h3>Odinstalace</h3>';
           $this->System->Setup->Uninstall();
+          $Output .= $this->ControlPanel();
+        } else
+        if($Action == 'reload_modules')
+        {
+          $Output .= '<h3>Znovunačtení seznamu modulů</h3>';
+          $this->System->ModuleManager->LoadModules();
+          $this->System->ModuleManager->SaveState();
           $Output .= $this->ControlPanel();
         } else
@@ -392 +402 @@
   function Install()
   {
+        global $DatabaseRevision;
+        
     $this->Database->query('CREATE TABLE IF NOT EXISTS `SystemVersion` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,
@@ -398 +410 @@
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
     $this->Database->query("INSERT INTO `SystemVersion` (`Id`, `Revision`) VALUES
-      (1, 591);");
+      (1, '.$DatabaseRevision.');");
     $this->Database->query("CREATE TABLE IF NOT EXISTS `Module` (
   `Id` int(11) NOT NULL AUTO_INCREMENT,