[Fmsystem-commits] [7894] added filter on control group

[Erik Holm-Larsen]

Revision: 7894
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7894
Author:   erikhl
Date:     2011-10-18 19:56:23 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
added filter on control group

Modified Paths:
--------------
    trunk/controller/inc/class.socontrol_group.inc.php
    trunk/controller/inc/class.uicontrol_group.inc.php

Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php  2011-10-18 19:47:08 UTC 
(rev 7893)
+++ trunk/controller/inc/class.socontrol_group.inc.php  2011-10-18 19:56:23 UTC 
(rev 7894)
@@ -346,6 +346,10 @@
                {
                        $filter_clauses[] = "controller_control_group.id = 
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
                }
+               if(isset($filters['control_areas']))
+               {
+                       $filter_clauses[] = 
"controller_control_group.control_area_id = 
{$this->marshal($filters['control_areas'],'int')}";
+               }
 
                if(count($filter_clauses))
                {

Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php  2011-10-18 19:47:08 UTC 
(rev 7893)
+++ trunk/controller/inc/class.uicontrol_group.inc.php  2011-10-18 19:56:23 UTC 
(rev 7894)
@@ -473,6 +473,12 @@
                        );
                        
                        $search_for = phpgw::get_var('query');
+                       
+                       $ctrl_area = phpgw::get_var('control_areas');
+                       if(isset($ctrl_area) && $ctrl_area > 0)
+                       {
+                               $filters['control_areas'] = $ctrl_area; 
+                       }
 
                        
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
                        {