Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Exclude cancelled events from count query on invitations calendar

Browse source
This commit is contained in:
Thomas Bruederli 2015-03-02 12:32:40 +01:00
parent 724ecc44bf
commit 03dd4b60b3
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/calendar/drivers/kolab/kolab_invitation_calendar.php
View file

@ -284,6 +284,11 @@ class kolab_invitation_calendar
}
}
$filter = array(
array('tags','!=','x-status:cancelled'),
array($subquery, 'OR')
);
// aggregate counts from all calendar folders
$count = 0;
foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
@ -291,7 +296,7 @@ class kolab_invitation_calendar
if ($cal->get_namespace() == 'other')
continue;
$count += $cal->count_events($start, $end, array(array($subquery, 'OR')));
$count += $cal->count_events($start, $end, $filter);
}
return $count;

4
plugins/libkolab/lib/kolab_format_xcal.php
View file

@ -635,6 +635,10 @@ abstract class kolab_format_xcal extends kolab_format
}
}
if (!empty($object['status'])) {
$tags[] = 'x-status:' . strtolower($object['status']);
}
return array_unique($tags);
}