Changeset 795 for trunk/Modules

Timestamp:

Feb 4, 2016, 3:42:03 PM (9 years ago)

Author:

chronos

Message:

• Modified: In module IS use slow HAVING in SQL query for user filter. To show subtables use faster WHERE.

Location:

trunk/Modules

Files:

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

trunk/Modules/IS/IS.php

@@ -414 +414 @@
       else $SourceTable = '`'.$FormClass['Table'].'` AS `TX`';
 
+    $WhereFilter = $Filter;
+    $HavingFilter = '';
+
     // Build form type filter
     $TypeFilter = '';
@@ -427 +430 @@
     if($TypeFilter != '')
     {
-      if($Filter != '') $Filter = ' AND';
-      $Filter .= ' '.$TypeFilter;
+      if($HavingFilter != '') $HavingFilter = ' AND';
+      $HavingFilter .= ' '.$TypeFilter;
     }
 
@@ -465 +468 @@
     if($UserFilter != '')
     {
-      if($Filter != '') $Filter .= ' AND';
-      $Filter .= ' '.$UserFilter;
-    }
-    if($Filter != '') $Filter = ' HAVING '.$Filter;
+      if($HavingFilter != '') $Havingilter .= ' AND';
+      $HavingFilter .= ' '.$UserFilter;
+    }
+    if($WhereFilter != '') $Filter = ' WHERE '.$WhereFilter;
+    if($HavingFilter != '') $Filter = ' HAVING '.$HavingFilter;
+
 
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)

trunk/Modules/Network/Network.php

@@ -192 +192 @@
         'Signal' => array('Type' => 'TNetworkSignalListInterface', 'Caption' => 'Signál', 'Default' => ''),
         'Wireless' => array('Type' => 'TNetworkInterfaceWirelessListInterface', 'Caption' => 'Bezdrátové spoje', 'Default' => ''),
-
       ),
     ));