extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-07 14:39:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix problems with merge print from list

Browse Source 
- Dialog in document with 'Whole query'
- Missing participants
This commit is contained in:
Nathan Gray 2014-05-26 16:23:02 +00:00
parent fb2fe616b5
commit 43dd646102
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_merge.inc.php
View File

@ -413,12 +413,12 @@ class calendar_merge extends bo_merge
*/
public function participant($plugin,$id,$n)
{
if(!is_array($id) || !$id['start']) {
if(!is_array($id) || !$id['start'] || !is_array($id['participants'])) {
$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
} else {
$event = $id;
}
if(!is_array($event['participants']) || $n >= count($event['participants'])) return array();
$participant = null;

1
calendar/inc/class.calendar_uilist.inc.php
View File

@ -528,6 +528,7 @@ class calendar_uilist extends calendar_ui
$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name,'calendar');
@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
$query['num_rows'] = -1; // all
$query['csv_export'] = true;
$this->get_rows($query,$checked,$readonlys,!in_array($action,array('ical','document'))); // true = only return the id's
}
// for calendar integration we have to fetch all rows and unset the not selected ones, as we can not filter by id