mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
"fixed missing categories in \"all categories\" filter, if (sub-)categories have same names"
This commit is contained in:
parent
7198ed861f
commit
e98c7b8770
@ -86,12 +86,14 @@ class bo_resources
|
|||||||
$filter['cat_id'] = $query['filter'];
|
$filter['cat_id'] = $query['filter'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
elseif (($readcats = $this->acl->get_cats(EGW_ACL_READ)))
|
||||||
{
|
{
|
||||||
$readcats = array_flip((array)$this->acl->get_cats(EGW_ACL_READ));
|
$filter['cat_id'] = array_keys($readcats);
|
||||||
if($readcats) $filter = $filter + array('cat_id' => $readcats);
|
}
|
||||||
|
if ($query['show_bookable'])
|
||||||
|
{
|
||||||
|
$filter['bookable'] = true;
|
||||||
}
|
}
|
||||||
if($query['show_bookable']) $filter = $filter + array('bookable' => true);
|
|
||||||
$order_by = $query['order'] ? $query['order'].' '. $query['sort'] : '';
|
$order_by = $query['order'] ? $query['order'].' '. $query['sort'] : '';
|
||||||
$start = (int)$query['start'];
|
$start = (int)$query['start'];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user