holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use a different method of filtering out global categories

Browse Source
This commit is contained in:
Nathan Gray 2011-07-07 18:34:33 +00:00
parent 283a2a01ff
commit 52f3dd9ed2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,10 +324,10 @@ class admin_categories
} }
if($query['col_filter']['app']) if($query['col_filter']['app'])
{ {
$globalcat = false; $filter['appname'] = $query['col_filter']['app'];
} }
$cats = new categories($filter['owner'],$query['appname']); $cats = new categories($filter['owner'],$query['appname']);
$globalcat = $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
$rows = $cats->return_sorted_array($query['start'],false,$query['search'],$query['sort'],$query['order'],$globalcat,$parent=0,true,$filter); $rows = $cats->return_sorted_array($query['start'],false,$query['search'],$query['sort'],$query['order'],$globalcat,$parent=0,true,$filter);
$count = $cats->total_records; $count = $cats->total_records;
foreach($rows as $key => &$row) foreach($rows as $key => &$row)