[Fmsystem-commits] [17148] property: location filter on simplified ui for ticket

[sigurdne]

Revision: 17148
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17148
Author:   sigurdne
Date:     2017-10-10 05:08:58 -0400 (Tue, 10 Oct 2017)
Log Message:
-----------
property: location filter on simplified ui for ticket

Modified Paths:
--------------
    trunk/property/inc/class.uitts.inc.php

Modified: trunk/property/inc/class.uitts.inc.php
===================================================================
--- trunk/property/inc/class.uitts.inc.php      2017-10-10 08:41:23 UTC (rev 
17147)
+++ trunk/property/inc/class.uitts.inc.php      2017-10-10 09:08:58 UTC (rev 
17148)
@@ -722,7 +722,49 @@
                                'list' => $values_combo_box[3]
                        );
 
+                       $values_combo_box[1] = 
$this->bocommon->select_district_list('filter', $this->district_id);
+                       $default_value = array('id' => '', 'name' => lang('no 
district'));
+                       array_unshift($values_combo_box[1], $default_value);
+                       $link = self::link(array(
+                                       'menuaction' => 
'property.uilocation.get_part_of_town',
+                                       'district_id' => $this->district_id,
+                                       'part_of_town_id' => 
$this->part_of_town_id,
+                                       'phpgw_return_as' => 'json'
+                       ));
+
+                       $code = '
+                               var link = "' . $link . '";
+                               var data = {"district_id": $(this).val()};
+                               execute_ajax(link,
+                                       function(result){
+                                               var $el = $("#part_of_town_id");
+                                               $el.empty();
+                                               $.each(result, function(key, 
value) {
+                                                 
$el.append($("<option></option>").attr("value", value.id).text(value.name));
+                                               });
+                                       }, data, "GET", "json"
+                               );
+                               ';
+
+                       $combos[] = array('type' => 'filter',
+                               'name' => 'district_id',
+                               'extra' => $code,
+                               'text' => lang('district'),
+                               'list' => $values_combo_box[1]
+                       );
+
+                       $values_combo_box[2] = 
$this->bocommon->select_part_of_town('filter', $this->part_of_town_id, 
$this->district_id);
+                       $default_value = array('id' => '', 'name' => lang('no 
part of town'));
+                       array_unshift($values_combo_box[2], $default_value);
+                       $combos[] = array('type' => 'filter',
+                               'name' => 'part_of_town_id',
+                               'extra' => '',
+                               'text' => lang('part of town'),
+                               'list' => $values_combo_box[2]
+                       );
+
                        $values_combo_box[5] = array(); //reported by
+
                        if(!$this->simple)
                        {
                                $values_combo_box[0] = 
$this->cats->formatted_xslt_list(array('format' => 'filter',
@@ -743,47 +785,6 @@
                                        'list' => $_categories
                                );
 
-                               $values_combo_box[1] = 
$this->bocommon->select_district_list('filter', $this->district_id);
-                               $default_value = array('id' => '', 'name' => 
lang('no district'));
-                               array_unshift($values_combo_box[1], 
$default_value);
-                               $link = self::link(array(
-                                               'menuaction' => 
'property.uilocation.get_part_of_town',
-                                               'district_id' => 
$this->district_id,
-                                               'part_of_town_id' => 
$this->part_of_town_id,
-                                               'phpgw_return_as' => 'json'
-                               ));
-
-                               $code = '
-                                       var link = "' . $link . '";
-                                       var data = {"district_id": 
$(this).val()};
-                                       execute_ajax(link,
-                                               function(result){
-                                                       var $el = 
$("#part_of_town_id");
-                                                       $el.empty();
-                                                       $.each(result, 
function(key, value) {
-                                                         
$el.append($("<option></option>").attr("value", value.id).text(value.name));
-                                                       });
-                                               }, data, "GET", "json"
-                                       );
-                                       ';
-
-                               $combos[] = array('type' => 'filter',
-                                       'name' => 'district_id',
-                                       'extra' => $code,
-                                       'text' => lang('district'),
-                                       'list' => $values_combo_box[1]
-                               );
-
-                               $values_combo_box[2] = 
$this->bocommon->select_part_of_town('filter', $this->part_of_town_id, 
$this->district_id);
-                               $default_value = array('id' => '', 'name' => 
lang('no part of town'));
-                               array_unshift($values_combo_box[2], 
$default_value);
-                               $combos[] = array('type' => 'filter',
-                                       'name' => 'part_of_town_id',
-                                       'extra' => '',
-                                       'text' => lang('part of town'),
-                                       'list' => $values_combo_box[2]
-                               );
-
                                $values_combo_box[4] = 
$this->_get_user_list($this->user_id);
 
                                $filter_tts_assigned_to_me = 
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_assigned_to_me'];