extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-09 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get custom field values working when custom field has no ID

Browse Source
This commit is contained in:
Nathan Gray 2012-06-12 20:58:25 +00:00
parent 321814260f
commit 3364d1a1df
1 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
etemplate/js/et2_extension_customfields.js
View File

@ -20,7 +20,7 @@
et2_core_inputWidget; et2_core_inputWidget;
*/ */
var et2_customfields_list = et2_baseWidget.extend([et2_IDetachedDOM], { var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput], {
attributes: { attributes: {
'customfields': { 'customfields': {
@ -147,7 +147,8 @@ var et2_customfields_list = et2_baseWidget.extend([et2_IDetachedDOM], {
var field = this.options.customfields[field_name]; var field = this.options.customfields[field_name];
var id = this.id + "["+this.prefix + field_name+"]"; var id = this.prefix+field_name;
// Need curlies around ID for nm row expansion // Need curlies around ID for nm row expansion
if(this.id == '$row') if(this.id == '$row')
{ {
@ -230,6 +231,10 @@ var et2_customfields_list = et2_baseWidget.extend([et2_IDetachedDOM], {
{ {
if(typeof data[key] === 'object' && ! _attrs[key]) _attrs[key] = data[key]; if(typeof data[key] === 'object' && ! _attrs[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 (this.id) if (this.id)
@ -277,6 +282,12 @@ var et2_customfields_list = et2_baseWidget.extend([et2_IDetachedDOM], {
if(!this.widgets[field_name] || !this.widgets[field_name].set_value) continue; if(!this.widgets[field_name] || !this.widgets[field_name].set_value) continue;
var value = _value[this.prefix + field_name] ? _value[this.prefix + field_name] : null; var value = _value[this.prefix + field_name] ? _value[this.prefix + field_name] : null;
// Check if ID was missing
if(value == null && this.id == 'custom_fields' && this.getArrayMgr("content").getEntry(this.prefix + field_name))
{
value = this.getArrayMgr("content").getEntry(this.prefix + field_name);
}
switch(this.options.customfields[field_name].type) switch(this.options.customfields[field_name].type)
{ {
case 'date': case 'date':
@ -293,6 +304,49 @@ var et2_customfields_list = et2_baseWidget.extend([et2_IDetachedDOM], {
} }
}, },
/**
* et2_IInput so the custom field can be it's own widget.
*/
getValue: function() {
// Not using an ID means we have to grab all the widget values, and put them where server knows to look
if(this.id != 'custom_fields')
{
return null;
}
var value = {};
for(var field_name in this.options.customfields)
{
if(this.widgets[field_name].getValue)
{
value[this.prefix + field_name] = this.widgets[field_name].getValue();
}
}
return value;
},
isDirty: function() {
var dirty = true;
for(var field_name in this.options.customfields)
{
if(this.widgets[field_name].isDirty)
{
dirty = dirty && this.widgets[field_name].isDirty();
}
}
return dirty;
},
resetDirty: function() {
for(var field_name in this.options.customfields)
{
if(this.widgets[field_name].resetDirty)
{
this.widgets[field_name].resetDirty();
}
}
},
/** /**
* Adapt provided attributes to match options for widget * Adapt provided attributes to match options for widget
*/ */