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

Refine select option searching when the id is like parent[selectbox].

Browse Source 
- only search parents when the ID has multiple parts
- fix case when selectbox was in the sel_options arrayMgr, but had no options, parent was used as select options
This commit is contained in:
Ralf Becker 2014-07-23 09:14:24 +00:00
parent 8eb1cb6ee6
commit 0abcd5e68f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etemplate/js/et2_widget_selectbox.js
View File

@ -791,13 +791,21 @@ jQuery.extend(et2_selectbox,
} }
// Try name like widget[$row] // Try name like widget[$row]
if(!content_options || content_options.length == 0) if(name_parts.length > 1 && (!content_options || content_options.length == 0 ))
{ {
var pop_that = jQuery.extend([],name_parts); var pop_that = jQuery.extend([],name_parts);
while(pop_that.length > 0 && (!content_options || content_options.length == 0)) while(pop_that.length > 0 && (!content_options || content_options.length == 0))
{ {
pop_that.pop(); var last = pop_that.pop();
content_options = widget.getArrayMgr('sel_options').getEntry(pop_that.join('[')); content_options = widget.getArrayMgr('sel_options').getEntry(pop_that.join('['));
// Double check, might have found a normal parent namespace ( eg subgrid in subgrid[selectbox] )
// with an empty entry for the selecbox. If there were valid options here,
// we would have found them already, and keeping this would result in the ID as an option
if(content_options && typeof content_options[last] != 'undefined' && content_options[last] )
{
content_options = content_options[last];
}
} }
} }