[Fmsystem-commits] [7939] added filter-logic

[Erik Holm-Larsen]

Revision: 7939
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7939
Author:   erikhl
Date:     2011-10-26 07:00:33 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
added filter-logic

Modified Paths:
--------------
    trunk/controller/inc/class.socontrol_item.inc.php
    trunk/controller/inc/class.uicontrol_item.inc.php

Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php   2011-10-26 06:16:11 UTC 
(rev 7938)
+++ trunk/controller/inc/class.socontrol_item.inc.php   2011-10-26 07:00:33 UTC 
(rev 7939)
@@ -206,6 +206,14 @@
                {
                        $filter_clauses[] = 
"(controller_control_item.control_group_id IS NULL OR 
controller_control_item.control_group_id=0)";
                }
+               if(isset($filters['control_groups']))
+               {
+                       $filter_clauses[] = 
"controller_control_item.control_group_id = 
{$this->marshal($filters['control_groups'],'int')}";
+               }
+               if(isset($filters['control_areas']))
+               {
+                       $filter_clauses[] = 
"controller_control_item.control_area_id = 
{$this->marshal($filters['control_areas'],'int')}";
+               }
                
                if(count($filter_clauses))
                {

Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php   2011-10-26 06:16:11 UTC 
(rev 7938)
+++ trunk/controller/inc/class.uicontrol_item.inc.php   2011-10-26 07:00:33 UTC 
(rev 7939)
@@ -502,6 +502,17 @@
                                'filters' => $filters
                        );
                        
+                       $ctrl_area = phpgw::get_var('control_areas');
+                       if(isset($ctrl_area) && $ctrl_area > 0)
+                       {
+                               $filters['control_areas'] = $ctrl_area; 
+                       }
+                       $ctrl_group = phpgw::get_var('control_groups');
+                       if(isset($ctrl_group) && $ctrl_group > 0)
+                       {
+                               $filters['control_groups'] = $ctrl_group; 
+                       }
+                       
                        $search_for = phpgw::get_var('query');
 
                        
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)