[Fmsystem-commits] [11538] property: top level cats in list

[Sigurd Nes]

Revision: 11538
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11538
Author:   sigurdne
Date:     2013-12-17 10:26:45 +0000 (Tue, 17 Dec 2013)
Log Message:
-----------
property: top level cats in list

Modified Paths:
--------------
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/class.uiworkorder.inc.php

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2013-12-17 10:00:51 UTC (rev 
11537)
+++ trunk/property/inc/class.uiproject.inc.php  2013-12-17 10:26:45 UTC (rev 
11538)
@@ -286,9 +286,20 @@
                                $default_value = array 
('id'=>'','name'=>lang('no district'));
                                array_unshift 
($values_combo_box[1],$default_value);
 
-                               $values_combo_box[2] = 
$this->cats->formatted_xslt_list(array('format'=>'filter','selected' => 
$this->cat_id,'globals' => True));
-                               $default_value = array ('cat_id'=>'','name'=> 
lang('no category'));
-                               array_unshift 
($values_combo_box[2]['cat_list'],$default_value);
+                               $_cats = 
$this->cats->return_sorted_array(0,false,'','','',false, false);
+                               
//$this->cats->formatted_xslt_list(array('format'=>'filter','selected' => 
$this->cat_id,'globals' => True));
+                               
+                               $values_combo_box[2] = array();
+                               foreach($_cats as $_cat)
+                               {
+                                       if($_cat['level'] == 0 )
+                                       {
+                                               $values_combo_box[2][] = $_cat;
+                                       }
+                               }
+                               
+                               $default_value = array ('id'=>'','name'=> 
lang('no category'));
+                               array_unshift 
($values_combo_box[2],$default_value);
 
                                $values_combo_box[3]  = 
$this->bo->select_status_list('filter',$this->status_id);
                                array_unshift ($values_combo_box[3],array 
('id'=>'all','name'=> lang('all')));
@@ -504,7 +515,8 @@
                                                                array
                                                                ( //div values  
combo_box_2
                                                                        'id' => 
'values_combo_box_2',
-                                                                       'value' 
=> $this->bocommon->select2String($values_combo_box[2]['cat_list'], 'cat_id') 
//i.e.  id,value/id,vale/
+                                                                       'value' 
=> $this->bocommon->select2String($values_combo_box[2])
+                                                                       
//'value'       => 
$this->bocommon->select2String($values_combo_box[2]['cat_list'], 'cat_id') 
//i.e.  id,value/id,vale/
                                                                ),
                                                                array
                                                                ( //div values  
combo_box_3

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2013-12-17 10:00:51 UTC 
(rev 11537)
+++ trunk/property/inc/class.uiworkorder.inc.php        2013-12-17 10:26:45 UTC 
(rev 11538)
@@ -276,11 +276,26 @@
                                $values_combo_box[0]  = 
$this->bocommon->select_district_list('filter',$this->district_id);
                                $default_value = array 
('id'=>'','name'=>lang('no district'));
                                array_unshift 
($values_combo_box[0],$default_value);
-
+/*
                                $values_combo_box[1] = 
$this->cats->formatted_xslt_list(array('format'=>'filter','selected' => 
$this->cat_id,'globals' => True));
                                $default_value = array ('cat_id'=>'','name'=> 
lang('no category'));
                                array_unshift 
($values_combo_box[1]['cat_list'],$default_value);
+*/
 
+                               $_cats = 
$this->cats->return_sorted_array(0,false,'','','',false, false);
+                               
+                               $values_combo_box[1] = array();
+                               foreach($_cats as $_cat)
+                               {
+                                       if($_cat['level'] == 0 )
+                                       {
+                                               $values_combo_box[1][] = $_cat;
+                                       }
+                               }
+                               
+                               $default_value = array ('id'=>'','name'=> 
lang('no category'));
+                               array_unshift 
($values_combo_box[1],$default_value);
+
                                $values_combo_box[2]  = 
$this->bo->select_status_list('filter',$this->status_id);
                                array_unshift ($values_combo_box[2],array 
('id'=>'all','name'=> lang('all')));
                                array_unshift ($values_combo_box[2],array 
('id'=>'open','name'=> lang('open')));
@@ -477,7 +492,8 @@
                                                                array
                                                                ( //div values  
combo_box_1
                                                                        'id' => 
'values_combo_box_1',
-                                                                       'value' 
=> $this->bocommon->select2String($values_combo_box[1]['cat_list'], 'cat_id') 
//i.e.  id,value/id,vale/
+                                                                       'value' 
=> $this->bocommon->select2String($values_combo_box[1])
+                                                                       
//'value'       => 
$this->bocommon->select2String($values_combo_box[1]['cat_list'], 'cat_id') 
//i.e.  id,value/id,vale/
                                                                ),
                                                                array
                                                                ( //div values  
combo_box_2