extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow list to be cleared; always call search query hook, even if cached

Browse Source
This commit is contained in:
Nathan Gray 2012-05-29 22:25:40 +00:00
parent 41cf864a73
commit 31166f94a0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
etemplate/js/et2_widget_link.js
View File

@ -562,19 +562,20 @@ var et2_link_entry = et2_inputWidget.extend({
// Remember last search // Remember last search
this.last_search = this.search.val(); this.last_search = this.search.val();
if(request.term in this.cache) {
return response(this.cache[request.term]);
}
// Allow hook / tie in // Allow hook / tie in
if(this.options.query && typeof this.options.query == 'function') if(this.options.query && typeof this.options.query == 'function')
{ {
if(!this.options.query(request, response)) return false; if(!this.options.query(request, response)) return false;
} }
if(request.term in this.cache) {
return response(this.cache[request.term]);
}
this.search.addClass("loading"); this.search.addClass("loading");
this.clear.show(); this.clear.show();
var request = new egw_json_request("etemplate_widget_link::ajax_link_search::etemplate", var request = new egw_json_request("etemplate_widget_link::ajax_link_search::etemplate",
[this.app_select.val(), '', request.term], [this.app_select.val(), '', request.term, request.options],
this this
); );
this.response = response; this.response = response;
@ -844,7 +845,11 @@ var et2_link_string = et2_valueWidget.extend([et2_IDetachedDOM], {
set_value: function(_value) { set_value: function(_value) {
// Get data // Get data
if(!_value || _value == null) return; if(!_value || _value == null)
{
this.list.empty();
return;
}
if(!_value.to_app && typeof _value == "object" && this.options.application) if(!_value.to_app && typeof _value == "object" && this.options.application)
{ {
_value.to_app = this.options.application; _value.to_app = this.options.application;
@ -856,11 +861,11 @@ var et2_link_string = et2_valueWidget.extend([et2_IDetachedDOM], {
this._get_links(); this._get_links();
return; return;
} }
this.list.empty();
if(typeof _value == 'object' && _value.length > 0) { if(typeof _value == 'object' && _value.length > 0) {
// Have full info // Have full info
// Don't store new value, just update display // Don't store new value, just update display
this.list.empty();
// Make new links // Make new links
for(var i = 0; i < _value.length; i++) for(var i = 0; i < _value.length; i++)