holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

"fix: csv export is not always exporting custom fields"

Browse Source
This commit is contained in:
Ralf Becker 2009-11-10 20:18:35 +00:00
parent 9df8b0bdbf
commit aa90d987c1
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,7 +211,7 @@ class calendar_uilist extends calendar_ui
{ {
$this->adjust_for_search($params['search'],$params); $this->adjust_for_search($params['search'],$params);
} }
egw_session::appsession('calendar_list','calendar',$params); if (!$params['csv_export']) egw_session::appsession('calendar_list','calendar',$params);
// do we need to query custom fields and which // do we need to query custom fields and which
$select_cols = explode(',',$params['selectcols']); $select_cols = explode(',',$params['selectcols']);
@ -230,7 +230,7 @@ class calendar_uilist extends calendar_ui
'offset' => (int) $params['start'], 'offset' => (int) $params['start'],
'num_rows'=> $params['num_rows'], 'num_rows'=> $params['num_rows'],
'order' => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start', 'order' => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start',
'cfs' => $cfs, 'cfs' => $params['csv_explort'] ? array() : $cfs,
); );
switch($params['filter']) switch($params['filter'])
{ {
@ -300,9 +300,16 @@ class calendar_uilist extends calendar_ui
$readonlys['view['.$event['id'].']'] = !($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event)); $readonlys['view['.$event['id'].']'] = !($readonlys['edit['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_EDIT,$event));
$readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event); $readonlys['delete['.$event['id'].']'] = !$this->bo->check_perms(EGW_ACL_DELETE,$event);
$event['parts'] = implode(",\n",$this->bo->participants($event,true));
$event['recure'] = $this->bo->recure2string($event); $event['recure'] = $this->bo->recure2string($event);
if ($params['csv_export'])
{
$event['participants'] = implode(",\n",$this->bo->participants($event,true));
}
else
{
$event['parts'] = implode(",\n",$this->bo->participants($event,true));
$event['date'] = $this->bo->date2string($event['start']); $event['date'] = $this->bo->date2string($event['start']);
}
if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment
if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment