Changeset 665

Timestamp:

Jul 6, 2014, 10:15:07 PM (10 years ago)

Author:

chronos

Message:

• Opraveno: Nebylo monžé filtrovat výpisy v ISu u položek OneToMany.

File:

• trunk/Modules/IS/IS.php (modified) (2 diffs)

trunk/Modules/IS/IS.php

@@ -339 +339 @@
           array('Name' => $ItemIndex, 'Type' => $FormItem['Type']));
         if(array_key_exists('Filter'.$ItemIndex, $_POST) and ($_POST['Filter'.$ItemIndex] != ''))
-          $UserFilter .= ' AND ('.$FilterName.' LIKE "%'.$_POST['Filter'.$ItemIndex].'%")';
-      }
-    }
-    if(($Filter == '') and ($UserFilter != '')) $Filter = '1 '.$UserFilter;
-    if($Filter != '') $Filter = ' WHERE '.$Filter;
+        {
+          if($UserFilter != '') $UserFilter .= ' AND ';
+          $UserFilter .= '('.$FilterName.' LIKE "%'.$_POST['Filter'.$ItemIndex].'%")';
+        }
+      }
+    }
+    if($UserFilter != '')
+    {
+      if($Filter != '') $Filter = ' AND';
+      $Filter .= ' '.$UserFilter;
+    }
+    if($Filter != '') $Filter = ' HAVING '.$Filter;
 
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
@@ -386 +393 @@
     if($Filter != '')
     {
-      $Query = 'SELECT COUNT(*) FROM '.$SourceTable.' '.$Filter;
+      $Query = 'SELECT COUNT(*) FROM (SELECT '.$Columns.' FROM '.$SourceTable.' '.$Filter.') AS `TS`';
       $DbResult = $this->Database->query($Query);
       $DbRow = $DbResult->fetch_row();