extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix global filter excluding global cats limited to groups

Browse Source
This commit is contained in:
Nathan Gray 2011-06-27 14:28:13 +00:00
parent ad933f60c9
commit ec158c5e5c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,10 +305,6 @@ class admin_categories
if($query['filter'] > 0 || $query['col_filter']['owner']) { if($query['filter'] > 0 || $query['col_filter']['owner']) {
$owner = $query['col_filter']['owner'] ? $query['col_filter']['owner'] : $query['filter']; $owner = $query['col_filter']['owner'] ? $query['col_filter']['owner'] : $query['filter'];
} }
elseif ((string)$query['filter'] === (string)categories::GLOBAL_ACCOUNT)
{
$filter['owner'] = 0;
}
$cats = new categories($filter['owner'],$query['appname']); $cats = new categories($filter['owner'],$query['appname']);
$globalcat = isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'all_no_acl' : 1; // ignore acl only for admins $globalcat = isset($GLOBALS['egw_info']['user']['apps']['admin']) ? 'all_no_acl' : 1; // ignore acl only for admins
@ -316,7 +312,7 @@ class admin_categories
$count = $cats->total_records; $count = $cats->total_records;
foreach($rows as $key => &$row) foreach($rows as $key => &$row)
{ {
if($owner && $owner != $row['owner']) if($owner && $owner != $row['owner'] || ((string)$query['filter'] === (string)categories::GLOBAL_ACCOUNT && $row['owner'] > 0))
{ {
unset($rows[$key]); unset($rows[$key]);
$count--; $count--;