extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 07:49:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Need to get cachable options synchronously if it's a read only in a nextmatch row as we won't be able to set it later

Browse Source
This commit is contained in:
Nathan Gray 2016-03-09 21:05:09 +00:00
parent c1e0b16d88
commit 40f56f7ad5
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etemplate/js/et2_widget_selectbox.js
View File

@ -1109,17 +1109,34 @@ jQuery.extend(et2_selectbox, //(function(){ "use strict"; return
var cache_id = widget._type+'_'+options_string;
var cache = egw.window.et2_selectbox.type_cache[cache_id];
if (typeof cache == 'undefined')
// Options for a selectbox in a nextmatch must be returned now, as the
// widget we have is not enough to set the options later.
var in_nextmatch = false;
if(typeof cache === 'undefined' || typeof cache.length === 'undefined')
{
var parent = widget._parent;
while(parent !== null && !in_nextmatch)
{
in_nextmatch = (parent._type === 'nextmatch')
parent = parent._parent;
}
}
if (typeof cache == 'undefined' || in_nextmatch)
{
// Fetch with json instead of jsonq because there may be more than
// one widget listening for the response by the time it gets back,
// and we can't do that when it's queued.
egw.window.et2_selectbox.type_cache[cache_id] = egw.json(
var req = egw.json(
widget.getInstanceManager().app+'.etemplate_widget_menupopup.ajax_get_options.etemplate',
[widget._type,options_string,attrs.value]
).sendRequest(true);
).sendRequest(!in_nextmatch);
if(typeof cache === 'undefined')
{
egw.window.et2_selectbox.type_cache[cache_id] = req;
}
cache = req;
}
cache = egw.window.et2_selectbox.type_cache[cache_id];
if(typeof cache.done == 'function')
{
// pending, wait for it