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

some fixes to get "add favorite" in regular calendar views do something

Browse Source
This commit is contained in:
Ralf Becker 2013-12-08 22:56:23 +00:00
parent 921eaf73f1
commit 8da1afca1e
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/js/et2_core_inputWidget.js
View File

@ -180,7 +180,7 @@ var et2_inputWidget = et2_valueWidget.extend([et2_IInput,et2_ISubmitListener],
set_id: function(_value) {
this.id = _value;
this.dom_id = _value ? this.getInstanceManager().uniqueId+'_'+this.id : _value;
this.dom_id = _value && this.getInstanceManager() ? this.getInstanceManager().uniqueId+'_'+this.id : _value;
// Set the id of the _input_ node (in contrast to the default
// implementation, which sets the base node)

10
etemplate/js/et2_widget_selectbox.js
View File

@ -224,12 +224,16 @@ var et2_selectbox = et2_inputWidget.extend(
// Check whether the options entry was found, if not read it from the
// content array.
if (jQuery.isEmptyObject(_attrs["select_options"]))
{
if (content_options) _attrs['select_options'] = content_options;
var content_mgr = this.getArrayMgr('content');
if (content_mgr)
{
// If that didn't work, check according to ID
_attrs["select_options"] = content_options ? content_options : this.getArrayMgr('content')
.getEntry("options-" + this.id);
if (!content_options) _attrs["select_options"] = content_mgr.getEntry("options-" + this.id);
// Again, try last name part at top level - this is usually just the value
var content_options = this.getArrayMgr('content').getRoot().getEntry(name_parts[name_parts.length-1]);
var content_options = content_mgr.getRoot().getEntry(name_parts[name_parts.length-1]);
}
}
// Default to an empty object