extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix calendar report not taking all categories into account

Browse Source
This commit is contained in:
Hadi Nategh 2019-04-15 12:12:20 +02:00
parent 6f59d825a5
commit 36ca3dd024
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/inc/class.calendar_category_report.inc.php
View File

@ -224,7 +224,7 @@ class calendar_category_report extends calendar_ui{
$api_cats = new Api\Categories($GLOBALS['egw_info']['user']['account_id'],'calendar'); $api_cats = new Api\Categories($GLOBALS['egw_info']['user']['account_id'],'calendar');
if (is_null($content)) if (is_null($content))
{ {
$cats = $api_cats->return_sorted_array($start=0, false, '', 'ASC', 'cat_name', true, 0, true); $cats = $api_cats->return_sorted_array($start=0, false, '', 'ASC', 'cat_name', 'all_no_acl', 0, true);
$cats_status = $GLOBALS['egw_info']['user']['preferences']['calendar']['category_report']; $cats_status = $GLOBALS['egw_info']['user']['preferences']['calendar']['category_report'];
foreach ($cats as &$value) foreach ($cats as &$value)
{ {
@ -238,9 +238,19 @@ class calendar_category_report extends calendar_ui{
'enable' => true 'enable' => true
); );
} }
if (is_array($cats_status)) if (is_array($cats_status))
{ {
$content['grid'] = array_replace_recursive($content['grid'], $cats_status); foreach ($content['grid'] as &$row)
{
foreach ($cats_status as $value)
{
if ($row['cat_id'] == $value['cat_id'])
{
$row = $value;
}
}
}
} }
} }
else else