extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-27 10:23:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing category colors for app specific categories

Browse Source 
r42030: Make sure global categories is infolog when in infolog.  Other apps (tracker) may grab it first if we don't set it here
This commit is contained in:
Ralf Becker 2013-03-20 10:02:06 +00:00
parent 10703e36f0
commit 589a5e63cc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/inc/class.admin_categories.inc.php
View File

@ -336,7 +336,8 @@ class admin_categories
{ {
$filter['appname'] = $query['col_filter']['app']; $filter['appname'] = $query['col_filter']['app'];
} }
$cats = new categories($filter['owner'],$query['appname']); $old_cats = $GLOBALS['egw']->categories;
$GLOBALS['egw']->categories = $cats = new categories($filter['owner'],$query['appname']);
$globalcat = isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'all_no_acl' : $globalcat; // ignore acl only for admins $globalcat = isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'all_no_acl' : $globalcat; // ignore acl only for admins
$parent = $query['search'] ? false : 0; $parent = $query['search'] ? false : 0;
$rows = $cats->return_sorted_array($query['start'],false,$query['search'],$query['sort'],$query['order'],$globalcat,$parent,true,$filter); $rows = $cats->return_sorted_array($query['start'],false,$query['search'],$query['sort'],$query['order'],$globalcat,$parent,true,$filter);

7
infolog/inc/class.infolog_ui.inc.php
View File

@ -91,6 +91,13 @@ class infolog_ui
function __construct() function __construct()
{ {
if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog') translation::add_app('infolog'); if ($GLOBALS['egw_info']['flags']['currentapp'] != 'infolog') translation::add_app('infolog');
// Make sure Global category is infolog - on first load, it may not be
if($GLOBALS['egw_info']['flags']['currentapp'] == 'infolog' && !$GLOBALS['egw']->categories->app_name)
{
$GLOBALS['egw']->categories = new categories();
}
$this->bo = new infolog_bo(); $this->bo = new infolog_bo();
$this->tmpl = new etemplate(); $this->tmpl = new etemplate();