Fix missing category colors for app specific categories

This commit is contained in:
Nathan Gray 2013-03-15 14:49:02 +00:00
parent d4d2096a39
commit 237c5ffcdf

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);