forked from extern/egroupware
Fix missing custom fields
This commit is contained in:
parent
cf32147cc2
commit
f7f9e13916
@ -222,8 +222,7 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
|
||||
this._super.apply(this, arguments);
|
||||
|
||||
// Add in settings that are objects
|
||||
if(!_attrs.customfields)
|
||||
{
|
||||
|
||||
// Customized settings for this widget (unlikely)
|
||||
var data = this.getArrayMgr("modifications").getEntry(this.id);
|
||||
// Check for global settings
|
||||
@ -241,12 +240,11 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
|
||||
}
|
||||
for(var key in data)
|
||||
{
|
||||
if(typeof data[key] === 'object' && ! _attrs[key]) _attrs[key] = data[key];
|
||||
_attrs[key] = data[key];
|
||||
}
|
||||
for(var key in global_data)
|
||||
{
|
||||
if(typeof global_data[key] === 'object' && ! _attrs[key]) _attrs[key] = global_data[key];
|
||||
}
|
||||
if(typeof global_data[key] != 'undefined' && ! _attrs[key]) _attrs[key] = global_data[key];
|
||||
}
|
||||
|
||||
if (this.id)
|
||||
|
Loading…
Reference in New Issue
Block a user