Changeset 774

Timestamp:

Jan 2, 2016, 11:18:17 AM (8 years ago)

Author:

chronos

Message:

• Fixed: Wrong SQL query concatenation in IS module.
• Fixed: Update code was wrongly commented out.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/IS/IS.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 772; // Subversion revision
+$Revision = 774; // Subversion revision
 $DatabaseRevision = 770; // SQL structure revision
-$ReleaseTime = strtotime('2015-12-27');
+$ReleaseTime = strtotime('2016-01-01');

trunk/Common/Setup/Updates.php

@@ -1637 +1637 @@
 function UpdateTo768($Manager)
 {
-/*  $Manager->Execute('ALTER TABLE `NetworkDomainAlias` ADD `Domain` INT NOT NULL AFTER `Comment`;');
+  $Manager->Execute('ALTER TABLE `NetworkDomainAlias` ADD `Domain` INT NOT NULL AFTER `Comment`;');
   $Manager->Execute('ALTER TABLE `NetworkDomainAlias` ADD KEY `Domain` (`Domain`);');
   $Manager->Execute('UPDATE `NetworkDomainAlias` SET `Domain`=1');
@@ -1667 +1667 @@
   KEY `Domain` (`Domain`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;');
-*/
-        $Manager->Execute('ALTER TABLE `NetworkDomainItemFilter`
+  $Manager->Execute('ALTER TABLE `NetworkDomainItemFilter`
   ADD FOREIGN KEY (`Domain`) REFERENCES `NetworkDomain` (`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT;');
   $Manager->Execute('ALTER TABLE `NetworkDomainItemFilter`

trunk/Modules/IS/IS.php

@@ -465 +465 @@
     if($UserFilter != '')
     {
-      if($Filter != '') $Filter = ' AND';
+      if($Filter != '') $Filter .= ' AND';
       $Filter .= ' '.$UserFilter;
     }

trunk/Modules/Network/Network.php

@@ -310 +310 @@
       'Items' => array(
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+        'Parent' => array('Type' => 'TNetworkDomain', 'Caption' => 'Nadřazená doména', 'Default' => '', 'Null' => true),
         'Description' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => ''),
-        'Parent' => array('Type' => 'TNetworkDomain', 'Caption' => 'Nadřazená doména', 'Default' => '', 'Null' => true),
         'Serial' => array('Type' => 'Integer', 'Caption' => 'Sériové číslo', 'Default' => '1'),
         'Minimum' => array('Type' => 'Integer', 'Caption' => 'Minimum', 'Default' => '10800'),