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

Fix some bugs in export UI

Browse Source 
- Fix js error when selecting no users
- Fix function declaration mismatch
This commit is contained in:
Nathan Gray 2015-03-02 17:17:14 +00:00
parent 87e4ce6749
commit 393a35ad70
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,7 @@ class importexport_widget_filter extends etemplate_widget_transformer
* *
* @param string $cname * @param string $cname
*/ */
public function beforeSendToClient($cname) public function beforeSendToClient($cname, Array $expand = Array())
{ {
$form_name = self::form_name($cname, $this->id); $form_name = self::form_name($cname, $this->id);
if($this->getElementAttribute($form_name, 'customfields')) if($this->getElementAttribute($form_name, 'customfields'))
@ -140,9 +140,13 @@ class importexport_widget_filter extends etemplate_widget_transformer
$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);
} }
else if( $GLOBALS['egw_info']['apps'][$field['type']])
{
// Links
}
else else
{ {
error_log('Trying to filter with unsupported field type: ' . $field['type']); error_log('Trying to filter with unsupported field type ' . $lname . ': ' . $field['type']);
} }
} }
@ -164,11 +168,11 @@ class importexport_widget_filter extends etemplate_widget_transformer
} }
unset($widget); unset($widget);
} }
parent::beforeSendToClient($cname, $expand);
$this->setElementAttribute($form_name, 'customfields', $fields); $this->setElementAttribute($form_name, 'customfields', $fields);
$this->setElementAttribute($form_name, 'fields',array_fill_keys(array_keys($fields), true)); $this->setElementAttribute($form_name, 'fields',array_fill_keys(array_keys($fields), true));
parent::beforeSendToClient($cname);
return false; return false;
} }

2
importexport/js/app.js
View File

@ -125,7 +125,7 @@ app.classes.importexport = AppJS.extend(
var value = widget.getValue(); var value = widget.getValue();
// Only 1 selected, no checking needed // Only 1 selected, no checking needed
if(value.length <= 1) return; if(value == null || value.length <= 1) return;
// Don't jump it to the top, it's weird // Don't jump it to the top, it's weird
widget.selected_first = false; widget.selected_first = false;