diff --git a/etemplate/js/et2_core_arrayMgr.js b/etemplate/js/et2_core_arrayMgr.js index 9bb14893da..00122997fe 100644 --- a/etemplate/js/et2_core_arrayMgr.js +++ b/etemplate/js/et2_core_arrayMgr.js @@ -428,11 +428,6 @@ var et2_readonlysArrayMgr = et2_arrayMgr.extend( */ expandName: function(ident) { - // this is a temp. workaround to get calendar conflicts working again - if (!this.perspectiveData.owner) - { - return this._super.apply(this, arguments); - } return this.perspectiveData.owner.getArrayMgr('content').expandName(ident); } }); diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js index e4066eed19..85dfbe4ed8 100644 --- a/etemplate/js/etemplate2.js +++ b/etemplate/js/etemplate2.js @@ -189,9 +189,11 @@ etemplate2.prototype._createArrayManagers = function(_data) break; case "readonlys": result[key] = new et2_readonlysArrayMgr(_data[key]); + result[key].perspectiveData.owner = this.widgetContainer; break; default: result[key] = new et2_arrayMgr(_data[key]); + result[key].perspectiveData.owner = this.widgetContainer; } }