extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-01 10:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

backport of some of nathans bugfixes (r28977,r29155,r29162)

Browse Source
This commit is contained in:
Klaus Leithoff 2010-02-10 10:10:59 +00:00
parent 30cc33e3e2
commit 8c99f00c6b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/inc/class.ajax_select_widget.inc.php
View File

@ -231,6 +231,9 @@ class ajax_select_widget
if(is_numeric($value)) { if(is_numeric($value)) {
$value = (string)$value; $value = (string)$value;
} }
if($value === null) {
unset($options[$key]);
}
} }
$options = $GLOBALS['egw']->js->convert_phparray_jsarray("options['$name']", $options, true); $options = $GLOBALS['egw']->js->convert_phparray_jsarray("options['$name']", $options, true);
$GLOBALS['egw']->js->set_onload("if(!options) { $GLOBALS['egw']->js->set_onload("if(!options) {
@ -239,7 +242,7 @@ class ajax_select_widget
$options;\n $options;\n
ajax_select_widget_setup('$name', '$onchange', options['$name'], '" . $GLOBALS['egw_info']['flags']['currentapp'] . "'); ajax_select_widget_setup('$name', '$onchange', options['$name'], '" . $GLOBALS['egw_info']['flags']['currentapp'] . "');
"); ");
$GLOBALS['egw']->js->validate_file('', 'ajax_select', 'etemplate'); $GLOBALS['egw']->js->validate_file('.', 'ajax_select', 'etemplate');
return True; // no extra label return True; // no extra label
} }
@ -250,6 +253,10 @@ class ajax_select_widget
if(!is_array($value_in)) { if(!is_array($value_in)) {
$value_in = $extension_data['old_value']; $value_in = $extension_data['old_value'];
} }
// Check for blur text left in
if($extension_data['options']['id_field'] == self::ARRAY_KEY && $value_in['search'] == lang('Search...') ) {
$value_in['search'] = '';
}
// They typed something in, but didn't choose a result // They typed something in, but didn't choose a result
if(!$value_in['value'] && $value_in['search']) { if(!$value_in['value'] && $value_in['search']) {