[Fmsystem-commits] [17201] more on helpdesk: support for top categories

[sigurdne]

Revision: 17201
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17201
Author:   sigurdne
Date:     2017-10-28 15:57:58 -0400 (Sat, 28 Oct 2017)
Log Message:
-----------
more on helpdesk: support for top categories

Modified Paths:
--------------
    trunk/helpdesk/inc/class.menu.inc.php
    trunk/helpdesk/inc/class.uitts.inc.php

Modified: trunk/helpdesk/inc/class.menu.inc.php
===================================================================
--- trunk/helpdesk/inc/class.menu.inc.php       2017-10-28 11:07:00 UTC (rev 
17200)
+++ trunk/helpdesk/inc/class.menu.inc.php       2017-10-28 19:57:58 UTC (rev 
17201)
@@ -166,6 +166,8 @@
 
                                if($subs)
                                {
+                                       $menus['navbar']['helpdesk']['url'] = 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'helpdesk.uitts.index', 'parent_cat_id' => -1));
+
                                        foreach ($_categories as $_category)
                                        {
                                                
$menus['navigation']["helpdesk_{$_category['id']}"] = array
@@ -174,8 +176,7 @@
                                                                'text'  => 
$_category['name'],
                                                                'image'         
=> array('helpdesk', 'helpdesk')
                                                        );
-                                               }
-
+                                       }
                                }
                                else
                                {

Modified: trunk/helpdesk/inc/class.uitts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.uitts.inc.php      2017-10-28 11:07:00 UTC (rev 
17200)
+++ trunk/helpdesk/inc/class.uitts.inc.php      2017-10-28 19:57:58 UTC (rev 
17201)
@@ -870,7 +870,7 @@
                        if($this->parent_cat_id)
                        {
                                $parent_category =  
CreateObject('phpgwapi.categories', -1, 'helpdesk', 
'.ticket')->return_single($this->parent_cat_id);
-                               $appname = $parent_category[0]['name'];
+                               $appname = !empty($parent_category[0]['name']) 
? $parent_category[0]['name'] : $this->lang_app_name;
                        }
 
                        $function_msg = lang('list ticket');
@@ -2252,7 +2252,16 @@
 
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('user_id_select'), $xsl_rootdir);
 
-                       $users = 
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_EDIT, 
$this->acl_location, 'helpdesk', $this->_group_candidates);
+                       if($this->parent_cat_id)
+                       {
+                               $acl_location = 
".ticket.category.{$this->parent_cat_id}";
+                       }
+                       else
+                       {
+                               $acl_location = $this->acl_location;
+                       }
+
+                       $users = 
$GLOBALS['phpgw']->acl->get_user_list_right(PHPGW_ACL_PRIVATE, $acl_location, 
'helpdesk', $this->_group_candidates);
                        $user_list = array();
                        $selected_found = false;
                        foreach ($users as $user)