lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better error management

Browse Source
This commit is contained in:
Laurent Destailleur 2014-08-31 15:09:10 +02:00
parent 154d1520fb
commit 6e54577167
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
htdocs/core/lib/ajax.lib.php
View File

@ -98,26 +98,30 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
$("input#search_'.$htmlname.'").autocomplete({ $("input#search_'.$htmlname.'").autocomplete({
source: function( request, response ) { source: function( request, response ) {
$.get("'.$url.($urloption?'?'.$urloption:'').'", { '.$htmlname.': request.term }, function(data){ $.get("'.$url.($urloption?'?'.$urloption:'').'", { '.$htmlname.': request.term }, function(data){
response($.map( data, function( item ) { if (data != null)
if (autoselect == 1 && data.length == 1) { {
$("#search_'.$htmlname.'").val(item.value); response($.map( data, function(item) {
$("#'.$htmlname.'").val(item.key).trigger("change"); if (autoselect == 1 && data.length == 1) {
} $("#search_'.$htmlname.'").val(item.value);
var label = item.label.toString(); $("#'.$htmlname.'").val(item.key).trigger("change");
var update = {}; }
if (options.update) { var label = item.label.toString();
$.each(options.update, function(key, value) { var update = {};
update[key] = item[value]; if (options.update) {
}); $.each(options.update, function(key, value) {
} update[key] = item[value];
var textarea = {}; });
if (options.update_textarea) { }
$.each(options.update_textarea, function(key, value) { var textarea = {};
textarea[key] = item[value]; if (options.update_textarea) {
}); $.each(options.update_textarea, function(key, value) {
} textarea[key] = item[value];
return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled } });
})); }
return { label: label, value: item.value, id: item.key, update: update, textarea: textarea, disabled: item.disabled }
}));
}
else console.error("Error: Ajax url '.$url.($urloption?'?'.$urloption:'').' has returned an empty page. Should be an empty json array.");
}, "json"); }, "json");
}, },
dataType: "json", dataType: "json",

2
htdocs/societe/ajax/company.php
View File

@ -18,7 +18,7 @@
*/ */
/** /**
* \file htdocs/product/ajax/products.php * \file htdocs/product/ajax/company.php
* \brief File to return Ajax response on product list request * \brief File to return Ajax response on product list request
*/ */