extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 09:58:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Avoid changing content manager select options when reading from template tags

Browse Source 
- More checking with namespaced select options to avoid grabbing all children of a parent namespace
This commit is contained in:
Nathan Gray 2016-04-20 21:20:36 +00:00
parent 22701ce83f
commit 1019046a0d
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/js/etemplate/et2_widget_selectbox.js
View File

@ -425,6 +425,11 @@ var et2_selectbox = (function(){ "use strict"; return et2_inputWidget.extend(
// Read the option-tags // Read the option-tags
var options = et2_directChildrenByTagName(_node, "option"); var options = et2_directChildrenByTagName(_node, "option");
if(options.length)
{
// Break reference to content manager, we don't want to add to it
this.options.select_options = jQuery.extend({},this.options.select_options);
}
var egw = this.egw(); var egw = this.egw();
for (var i = 0; i < options.length; i++) for (var i = 0; i < options.length; i++)
{ {
@ -917,6 +922,20 @@ jQuery.extend(et2_selectbox, //(function(){ "use strict"; return
{ {
content_options = content_options[last]; content_options = content_options[last];
} }
else if (content_options)
{
// Check for real values
for(var key in content_options)
{
if(!(isNaN(key) && typeof content_options[key] === 'string' ||
!isNaN(key) && typeof content_options[key] === 'object' && typeof content_options[key]['value'] !== 'undefined'))
{
// Found a parent of some other namespace
content_options = undefined;
break;
}
}
}
} }
} }