[Fmsystem-commits] [11536] property: categories

[Sigurd Nes]

Revision: 11536
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11536
Author:   sigurdne
Date:     2013-12-16 14:51:44 +0000 (Mon, 16 Dec 2013)
Log Message:
-----------
property: categories

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

Modified: trunk/phpgwapi/inc/class.categories.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.categories.inc.php 2013-12-16 08:54:41 UTC (rev 
11535)
+++ trunk/phpgwapi/inc/class.categories.inc.php 2013-12-16 14:51:44 UTC (rev 
11536)
@@ -578,11 +578,17 @@
                                        {
                                                $s .= ' selected="selected"';
                                        }
+
+/*
                                        $s .= '>';
                                        for ($j=0;$j<$cat['level'];++$j)
                                        {
                                                $s .= '&nbsp;';
                                        }
+*/
+
+                                       $s .= '>' . str_repeat('&nbsp;' , 
(int)$cat['level'] ) . $GLOBALS['phpgw']->strip_html($cat['name']);
+
                                        $s .= 
$GLOBALS['phpgw']->strip_html($cat['name']);
                                        if ($cat['app_name'] == 'phpgw')
                                        {
@@ -690,12 +696,7 @@
                                        $sel_cat = 'selected';
                                }
 
-                               $name = '';
-                               for ($i=0;$i<$cat['level'];$i++)
-                               {
-                                       $name .= ' . ';
-                               }
-                               $name .= 
$GLOBALS['phpgw']->strip_html($cat['name']);
+                               $name = str_repeat(' . ' , (int)$cat['level'] ) 
. $GLOBALS['phpgw']->strip_html($cat['name']);
 
                                if ($cat['app_name'] == 'phpgw')
                                {

Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php        2013-12-16 08:54:41 UTC 
(rev 11535)
+++ trunk/property/inc/class.uiworkorder.inc.php        2013-12-16 14:51:44 UTC 
(rev 11536)
@@ -1949,6 +1949,12 @@
 */
                        $cat_sub = $this->cats->return_sorted_array($start = 
0,$limit = false,$query = '',$sort = '',$order = '',$globals = False, false);
 
+
+                       foreach ($cat_sub as &$entry)
+                       {
+                               $entry['name'] = str_repeat (' . ' , 
(int)$entry['level'] ) . $entry['name'];
+                       }
+
                        $suppresscoordination                   = 
isset($config->config_data['project_suppresscoordination']) && 
$config->config_data['project_suppresscoordination'] ? 1 : '';
                        $user_list = $this->bocommon->get_user_list('select', 
isset($values['user_id']) && $values['user_id'] ? $values['user_id'] : 
$this->account ,false,false,-1,false,false,'',-1);
                        foreach ($user_list as &$user)