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

* Calendar - Fix exporting CSV from search results exported owner as participants

Browse Source
This commit is contained in:
nathangray 2018-03-02 11:13:18 -07:00
parent 3e7ecbe692
commit d76f467f94
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
calendar/inc/class.calendar_export_csv.inc.php
View File

@ -84,7 +84,7 @@ class calendar_export_csv implements importexport_iface_export_plugin {
if($states['view'] == 'listview') if($states['view'] == 'listview')
{ {
$ui->get_rows($query, $events, $unused); $ui->get_rows($query, $events, $unused);
} }
else else
{ {
$query['filter'] = 'custom'; $query['filter'] = 'custom';
@ -147,7 +147,15 @@ class calendar_export_csv implements importexport_iface_export_plugin {
// Add in participants // Add in participants
if($options['mapping']['participants']) if($options['mapping']['participants'])
{ {
$event['participants'] = implode(", ",$this->bo->participants($event,true)); if(is_array($event['participants']))
{
$event['participants'] = implode(", ",$this->bo->participants($event,true));
}
else
{
// Getting results from list already has participants formatted
$event['participants'] = str_replace("\n", ' ', $event['participants']);
}
} }
if (is_array($event)) if (is_array($event))
{ {
@ -229,10 +237,10 @@ class calendar_export_csv implements importexport_iface_export_plugin {
{ {
$states = $this->bo->cal_prefs['saved_states']; $states = $this->bo->cal_prefs['saved_states'];
$list = Api\Cache::getSession('calendar', 'calendar_list'); $list = Api\Cache::getSession('calendar', 'calendar_list');
$start= new Api\DateTime($list['startdate']); $start= new Api\DateTime($list['startdate']);
$end = new Api\DateTime($list['enddate']); $end = new Api\DateTime($list['enddate']);
if ($states['view'] == 'listview') if ($states['view'] == 'listview')
{ {
$list = Api\Cache::getSession('calendar', 'calendar_list'); $list = Api\Cache::getSession('calendar', 'calendar_list');