[Fmsystem-commits] [14943] rental: fix filter son district

[Sigurd Nes]

Revision: 14943
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14943
Author:   sigurdne
Date:     2016-04-27 07:15:15 +0000 (Wed, 27 Apr 2016)
Log Message:
-----------
rental: fix filter son district

Modified Paths:
--------------
    branches/Version-1_0-branch/rental/inc/class.uicomposite.inc.php

Modified: branches/Version-1_0-branch/rental/inc/class.uicomposite.inc.php
===================================================================
--- branches/Version-1_0-branch/rental/inc/class.uicomposite.inc.php    
2016-04-26 13:45:26 UTC (rev 14942)
+++ branches/Version-1_0-branch/rental/inc/class.uicomposite.inc.php    
2016-04-27 07:15:15 UTC (rev 14943)
@@ -78,7 +78,11 @@
                                        $object_count = 
rental_socomposite::get_instance()->get_count($search_for, $search_type, 
$filters);
                                        break;
                                case 'not_included_composites': // ... get all 
vacant and active composites not in contract
-                                       $filters = array('is_active' => 
phpgw::get_var('is_active'), 'is_vacant' => phpgw::get_var('occupancy'), 
'not_in_contract' => phpgw::get_var('contract_id'));
+                                       $filters = array('is_active' => 
phpgw::get_var('is_active'),
+                                               'is_vacant' => 
phpgw::get_var('occupancy'),
+                                               'not_in_contract' => 
phpgw::get_var('contract_id'),
+                                               'district_id' => $district_id
+                                       );
                                        $result_objects = 
rental_socomposite::get_instance()->get($start_index, $num_of_objects, 
$sort_field, $sort_ascending, $search_for, $search_type, $filters);
                                        $object_count = 
rental_socomposite::get_instance()->get_count($search_for, $search_type, 
$filters);
                                        break;