extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 05:49:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid edit series dialog in merged documents by using the csv_export flag

Browse Source
This commit is contained in:
Nathan Gray 2014-05-12 15:42:31 +00:00
parent 07b293c9ef
commit c2e56017c4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,8 +481,14 @@ class calendar_uilist extends calendar_ui
$params['options-selectcols']['pm_id'] = false;
}
// Not sure why this has to be echoed instead of appended, but that's what works.
echo calendar_uiviews::edit_series();
// Needs to be echoed here to deal with the iframe and the fact that we're
// sending dynamically generated javascript. After a search / filter
// the series code is missing, since we're just echoing it and not including
// it in any file.
if(!$params['csv_export'])
{
echo calendar_uiviews::edit_series();
}
//_debug_array($rows);
return $this->bo->total;
@ -528,6 +534,7 @@ class calendar_uilist extends calendar_ui
elseif(in_array($action,array('ical','document')))
{
$query = is_array($session_name) ? $session_name : egw_session::appsession($session_name,'calendar');
$query['csv_export'] = true;
@set_time_limit(0); // switch off the execution time limit, as for big selections it's too small
$this->get_rows($query,$events,$readonlys);
foreach($events as $key => $event)