[Fmsystem-commits] [15393] rental: default filter on composites to active

[sigurdne]

Revision: 15393
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15393
Author:   sigurdne
Date:     2016-07-28 13:02:03 +0000 (Thu, 28 Jul 2016)
Log Message:
-----------
rental: default filter on composites to active

Modified Paths:
--------------
    trunk/rental/inc/class.uicomposite.inc.php
    trunk/rental/inc/class.uicontract.inc.php
    trunk/rental/js/rental/contract.edit.js

Modified: trunk/rental/inc/class.uicomposite.inc.php
===================================================================
--- trunk/rental/inc/class.uicomposite.inc.php  2016-07-28 13:01:05 UTC (rev 
15392)
+++ trunk/rental/inc/class.uicomposite.inc.php  2016-07-28 13:02:03 UTC (rev 
15393)
@@ -178,8 +178,8 @@
                                        $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'),//is_vacant seems to be unused
+                                               'not_in_contract' => 
phpgw::get_var('contract_id'),'has_contract' => 
phpgw::get_var('has_contract'),'furnished_status' => 
phpgw::get_var('furnished_status'));
                                        $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;

Modified: trunk/rental/inc/class.uicontract.inc.php
===================================================================
--- trunk/rental/inc/class.uicontract.inc.php   2016-07-28 13:01:05 UTC (rev 
15392)
+++ trunk/rental/inc/class.uicontract.inc.php   2016-07-28 13:02:03 UTC (rev 
15393)
@@ -1991,7 +1991,7 @@
                                $active_options = array
                                        (
                                        array('id' => 'both', 'name' => 
lang('all')),
-                                       array('id' => 'active', 'name' => 
lang('in_operation')),
+                                       array('id' => 'active', 'name' => 
lang('in_operation'), 'selected' => 1),
                                        array('id' => 'non_active', 'name' => 
lang('out_of_operation')),
                                );
                                $has_contract_options = array

Modified: trunk/rental/js/rental/contract.edit.js
===================================================================
--- trunk/rental/js/rental/contract.edit.js     2016-07-28 13:01:05 UTC (rev 
15392)
+++ trunk/rental/js/rental/contract.edit.js     2016-07-28 13:02:03 UTC (rev 
15393)
@@ -300,7 +300,7 @@
                        JqueryPortico.updateinlineTableHelper(oTable1, 
link_included_composites);
 
                        
oTable2.dataTableSettings[2]['oFeatures']['bServerSide'] = true;
-                       oTable2.dataTableSettings[2]['ajax'] = {url: 
link_not_included_composites, data: {}, type: 'GET'};
+                       oTable2.dataTableSettings[2]['ajax'] = {url: 
link_not_included_composites, data: {is_active:'active'}, type: 'GET'};
                        JqueryPortico.updateinlineTableHelper(oTable2);
 
                        set_composite_data = 1;