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

Import/Export - fix fatal error if definition is not selected, happened when only one definition was available.

Browse Source
This commit is contained in:
nathangray 2017-07-31 14:16:20 -06:00
parent 9c30d6dd30
commit 7abf1bf5c8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
importexport/inc/class.importexport_export_ui.inc.php
View File

@ -99,6 +99,7 @@ class importexport_export_ui {
} }
if(count($sel_options['definition']) == 2 && !$content['definition']) { if(count($sel_options['definition']) == 2 && !$content['definition']) {
$content['definition'] = end($sel_options['definition']); $content['definition'] = end($sel_options['definition']);
unset($sel_options['definition']['']);
} }
unset($definitions); unset($definitions);
//$sel_options['definition']['expert'] = lang('Expert options'); //$sel_options['definition']['expert'] = lang('Expert options');

5
importexport/inc/class.importexport_widget_filter.inc.php
View File

@ -127,7 +127,10 @@ class importexport_widget_filter extends Etemplate\Widget\Transformer
} }
// We don't want the 'All' or 'Select...' if it's there // We don't want the 'All' or 'Select...' if it's there
unset($field['values']['']); if(is_array($field['values']) && $field['values'][''])
{
unset($field['values']['']);
}
$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'empty_label', ''); $this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'empty_label', '');
$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'tags', TRUE); $this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'tags', TRUE);
$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'multiple', TRUE); $this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'multiple', TRUE);