r28289 - /trunk/calendar/inc/class.calendar_uilist.inc.php

[ralfbecker]

Author: ralfbecker
Date: Tue Nov 10 21:18:35 2009
New Revision: 28289

URL: http://www.egroupware.org/viewvc/egroupware?rev=28289&view=rev
Log:
"fix: csv export is not always exporting custom fields"

Modified:
    trunk/calendar/inc/class.calendar_uilist.inc.php

Modified: trunk/calendar/inc/class.calendar_uilist.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/calendar/inc/class.calendar_uilist.inc.php?rev=28289&r1=28288&r2=28289&view=diff
==============================================================================
--- trunk/calendar/inc/class.calendar_uilist.inc.php (original)
+++ trunk/calendar/inc/class.calendar_uilist.inc.php Tue Nov 10 21:18:35 2009
@@ -211,7 +211,7 @@
  {
  $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
  $select_cols = explode(',',$params['selectcols']);
@@ -230,7 +230,7 @@
  'offset'  => (int) $params['start'],
  'num_rows'=> $params['num_rows'],
  'order'   => $params['order'] ? $params['order'].' '.$params['sort'] : 'cal_start',
- 'cfs'     => $cfs,
+ 'cfs'     => $params['csv_explort'] ? array() : $cfs,
  );
  switch($params['filter'])
  {
@@ -300,9 +300,16 @@
  $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);
 
- $event['parts'] = implode(",\n",$this->bo->participants($event,true));
  $event['recure'] = $this->bo->recure2string($event);
- $event['date'] = $this->bo->date2string($event['start']);
+ 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']);
+ }
  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
 


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
eGroupWare-cvs mailing list
eGroupWare-cvs@...
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs