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

Revert r46820 as it causes some widgets (tag list) problems.

Browse Source 
Fix select account changing selectbox default instead.
This commit is contained in:
Nathan Gray 2014-05-06 19:56:02 +00:00
parent 013062aa00
commit b76ace01f5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/js/et2_core_inheritance.js
View File

@ -124,9 +124,7 @@ var ClassWithAttributes = Class.extend(
_default = undefined;
}
// Use extend() to avoid a reference to default.
// Widget might change it, and alter the default
_attrs[key] = typeof _default == "object" ? jQuery.extend(true,{},_default) : _default;
attrs[key] = _default;
}
}

2
etemplate/js/et2_widget_selectAccount.js
View File

@ -113,7 +113,7 @@ var et2_selectAccount = et2_selectbox.extend(
case 'selectbox':
case 'groupmembers':
default:
jQuery.extend(this.options.select_options, this.egw().accounts(this.options.account_type));
this.options.select_options = jQuery.extend({}, this.options.select_options, this.egw().accounts(this.options.account_type));
break;
}

2
etemplate/js/et2_widget_selectbox.js
View File

@ -420,7 +420,7 @@ var et2_selectbox = et2_inputWidget.extend(
}
if (this.options.type == 'select-account')
{
jQuery.extend(this.options.select_options, this.egw().accounts(this.options.account_type));
this.options.select_options = jQuery.extend({},this.options.select_options, this.egw().accounts(this.options.account_type));
}
this.set_select_options(this.options.select_options);
},