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

Don't overwrite options passed into constructor, merge them

Browse Source
This commit is contained in:
Nathan Gray 2011-10-12 19:55:33 +00:00
parent 5b26a5faed
commit cc8891820c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etemplate/js/et2_widget_selectbox.js
View File

@ -79,7 +79,8 @@ var et2_selectbox = et2_inputWidget.extend({
// Try to find the options inside the "sel-options" array // Try to find the options inside the "sel-options" array
if(this.getArrayMgr("sel_options")) if(this.getArrayMgr("sel_options"))
{ {
_attrs["select_options"] = this.getArrayMgr("sel_options").getEntry(this.id); var content_options = this.getArrayMgr("sel_options").getEntry(this.id);
if(content_options) _attrs["select_options"] = jQuery.merge(_attrs["select_options"],content_options);
} }
// Check whether the options entry was found, if not read it from the // Check whether the options entry was found, if not read it from the