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

Ajax select widget fixes:

Browse Source 
- Remove the need for the user to have access to the eTemplate app
- Fix some settings being lost, and inability to clear the widget
This commit is contained in:
Nathan Gray 2007-09-26 17:21:36 +00:00
parent bdf27e11d9
commit b43a9982e3
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,7 +176,12 @@
$GLOBALS['egw']->js =& CreateObject('phpgwapi.javascript'); $GLOBALS['egw']->js =& CreateObject('phpgwapi.javascript');
} }
$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) { var options = new Object();}\n $options;\n ajax_select_widget_setup('$name', '$onchange', options['$name']); "); $GLOBALS['egw']->js->set_onload("if(!options) {
var options = new Object();
}\n
$options;\n
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
@ -202,7 +207,7 @@
if(!is_object($get_rows_obj) || !method_exists($get_rows_obj, $get_rows_method)) { if(!is_object($get_rows_obj) || !method_exists($get_rows_obj, $get_rows_method)) {
echo "$get_rows_app.$get_rows_class.$get_rows_method is not a valid method for getting the rows"; echo "$get_rows_app.$get_rows_class.$get_rows_method is not a valid method for getting the rows";
} else { } else {
$query = $extension_data + $value_in; $query = array_merge($extension_data, $value_in);
$count = $get_rows_obj->$get_rows_method($query, $results); $count = $get_rows_obj->$get_rows_method($query, $results);
if($count == 1) { if($count == 1) {
@ -218,7 +223,8 @@
} }
} }
} }
} elseif (!$value_in['value'] && !$value_in['search']) { } elseif ($value_in['search'] == '') {
// They're trying to clear the form
$value = null; $value = null;
$loop = $GLOBALS['egw_info']['etemplate']['loop'] || $extension_data['required']; $loop = $GLOBALS['egw_info']['etemplate']['loop'] || $extension_data['required'];
return !$extension_data['required']; return !$extension_data['required'];

6
etemplate/js/ajax_select.js
View File

@ -19,8 +19,10 @@
--> -->
//xajaxDebug = 1; //xajaxDebug = 1;
var current_app = 'etemplate';
function ajax_select_widget_setup(widget_id, onchange, options) { function ajax_select_widget_setup(widget_id, onchange, options, currentapp) {
current_app = currentapp;
if(onchange) { if(onchange) {
if(onchange == 1) { if(onchange == 1) {
onchange = function() {submitit(this.form, this.value);}; onchange = function() {submitit(this.form, this.value);};
@ -117,7 +119,7 @@ function change(e, value) {
selects[i].style.visibility = 'hidden'; selects[i].style.visibility = 'hidden';
} }
} }
xajax_doXMLHTTP("etemplate.ajax_select_widget.ajax_search.etemplate", id, value, set_id, query); xajax_doXMLHTTP(current_app + ".ajax_select_widget.ajax_search.etemplate", id, value, set_id, query);
} }