Changeset 774 for trunk/Modules

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk/Modules

Files:

• IS/IS.php (modified) (1 diff)
• Network/Network.php (modified) (1 diff)

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'),