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

Fix exporting custom fields when they're not selected in the nextmatch column list

Browse Source
This commit is contained in:
Nathan Gray 2013-09-04 16:14:30 +00:00
parent 580d8c15a3
commit 30d16c491f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
infolog/inc/class.infolog_export_csv.inc.php
View File

@ -38,18 +38,6 @@ class infolog_export_csv implements importexport_iface_export_plugin {
$this->export_object = new importexport_export_csv($_stream, (array)$options);
$this->export_object->set_mapping($options['mapping']);
// do we need to query the cf's
foreach($options['mapping'] + (array)$_definition->filter as $field => $map) {
if($field[0] == '#') {
$query['custom_fields'][] = $field;
if($GLOBALS['egw_info']['user']['apps'][$this->bo->customfields[substr($field,1)]['type']])
{
$cf_links[$field] = $this->bo->customfields[substr($field,1)]['type'];
}
}
}
$ids = array();
switch($options['selection'])
{
@ -58,6 +46,19 @@ class infolog_export_csv implements importexport_iface_export_plugin {
// Fall through
case 'filter':
case 'all':
// do we need to query the cf's
$query['custom_fields'] = false;
foreach($options['mapping'] + (array)$_definition->filter as $field => $map) {
if($field[0] == '#') {
$query['custom_fields'] = true;
$query['selectcols'] .= ",$field";
if($GLOBALS['egw_info']['user']['apps'][$this->bo->customfields[substr($field,1)]['type']])
{
$cf_links[$field] = $this->bo->customfields[substr($field,1)]['type'];
}
}
}
if($options['selection'] == 'filter')
{
$fields = importexport_helper_functions::get_filter_fields($_definition->application, $this);