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

Fix missing custom fields

Browse Source
This commit is contained in:
Nathan Gray 2013-03-20 16:41:46 +00:00
parent cf32147cc2
commit f7f9e13916
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/js/et2_extension_customfields.js
View File

@ -222,8 +222,7 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
this._super.apply(this, arguments); this._super.apply(this, arguments);
// Add in settings that are objects // Add in settings that are objects
if(!_attrs.customfields)
{
// Customized settings for this widget (unlikely) // Customized settings for this widget (unlikely)
var data = this.getArrayMgr("modifications").getEntry(this.id); var data = this.getArrayMgr("modifications").getEntry(this.id);
// Check for global settings // Check for global settings
@ -241,12 +240,11 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
} }
for(var key in data) 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) 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) if (this.id)