extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed no or only partial export of custom fields via nextmatch csv export

Browse Source
This commit is contained in:
Ralf Becker 2009-10-30 11:20:46 +00:00
parent e2a43a60ed
commit a08a1887a4
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -759,7 +759,7 @@ class addressbook_ui extends addressbook_bo
$do_email = $query['do_email']; $do_email = $query['do_email'];
$what = $query['sitemgr_display'] ? $query['sitemgr_display'] : ($do_email ? 'email' : 'index'); $what = $query['sitemgr_display'] ? $query['sitemgr_display'] : ($do_email ? 'email' : 'index');
if (!$id_only) if (!$id_only && !$query['csv_export']) // do NOT store state for csv_export or querying id's (no regular view)
{ {
$old_state = $GLOBALS['egw']->session->appsession($what,'addressbook',$query); $old_state = $GLOBALS['egw']->session->appsession($what,'addressbook',$query);
} }
@ -877,7 +877,9 @@ class addressbook_ui extends addressbook_bo
if ($query['sitemgr_display']) if ($query['sitemgr_display'])
{ {
$query['template'] = $query['sitemgr_display'].'.rows'; $query['template'] = $query['sitemgr_display'].'.rows';
} else { }
else
{
$query['template'] = $do_email ? 'addressbook.email.rows' : 'addressbook.index.rows'; $query['template'] = $do_email ? 'addressbook.email.rows' : 'addressbook.index.rows';
} }
if ($query['org_view']) // view the contacts of one organisation only if ($query['org_view']) // view the contacts of one organisation only
@ -937,14 +939,15 @@ class addressbook_ui extends addressbook_bo
$order,'',$wildcard,false,$op,array((int)$query['start'],(int) $query['num_rows']),$query['col_filter']); $order,'',$wildcard,false,$op,array((int)$query['start'],(int) $query['num_rows']),$query['col_filter']);
// do we need to read the custom fields, depends on the column is enabled and customfields exist // do we need to read the custom fields, depends on the column is enabled and customfields exist
// $query['csv_export'] allways needs to read ALL cf's
$columselection = $this->prefs['nextmatch-addressbook.'.($do_email ? 'email' : 'index').'.rows']; $columselection = $this->prefs['nextmatch-addressbook.'.($do_email ? 'email' : 'index').'.rows'];
$available_distib_lists=$this->get_lists(EGW_ACL_READ); $available_distib_lists=$this->get_lists(EGW_ACL_READ);
$columselection = $columselection ? explode(',',$columselection) : array(); $columselection = $columselection && !$query['csv_export'] ? explode(',',$columselection) : array();
if (!$id_only && $rows) if (!$id_only && $rows)
{ {
$show_custom_fields = (!$columselection || in_array('customfields',$columselection)) && $this->customfields; $show_custom_fields = (!$columselection || in_array('customfields',$columselection) || $query['csv_export']) && $this->customfields;
$show_calendar = !$columselection || in_array('calendar',$columselection); $show_calendar = !$columselection || in_array('calendar',$columselection);
$show_distributionlist = !$columselection || in_array('distrib_lists',$columselection) ||count($available_distib_lists); $show_distributionlist = !$columselection || in_array('distrib_lists',$columselection) || count($available_distib_lists);
if ($show_calendar || $show_custom_fields || $show_distributionlist) if ($show_calendar || $show_custom_fields || $show_distributionlist)
{ {
foreach($rows as $val) foreach($rows as $val)