extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 18:03:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Get private custom fields working

Browse Source
This commit is contained in:
Nathan Gray 2012-07-24 16:37:24 +00:00
parent ec34cbb070
commit 60c350b55e
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etemplate/inc/class.etemplate_widget_customfields.inc.php
View File

@ -135,12 +135,12 @@ class etemplate_widget_customfields extends etemplate_widget_transformer
$field_filter = explode(',', $this->attrs['field_names']); $field_filter = explode(',', $this->attrs['field_names']);
} }
$fields = $customfields; $fields = $customfields;
$use_private = self::expand_name($this->attrs['use-private'],0,0);
foreach((array)$fields as $key => $field) foreach((array)$fields as $key => $field)
{ {
// remove private or non-private cf's, if only one kind should be displayed // remove private or non-private cf's, if only one kind should be displayed
if ((string)self::expand_name($this->attrs['use-private'],0,0) !== '' && if ((string)$this->attrs['use-private'] !== '' && (boolean)$field['private'] != (boolean)$use_private)
(boolean)$field['private'] != (boolean)$this->attrs['use-private'])
{ {
unset($fields[$key]); unset($fields[$key]);
} }
@ -199,6 +199,7 @@ class etemplate_widget_customfields extends etemplate_widget_transformer
{ {
// This widget has different settings from global // This widget has different settings from global
$this->setElementAttribute($form_name, 'customfields', $fields); $this->setElementAttribute($form_name, 'customfields', $fields);
$this->setElementAttribute($form_name, 'fields', array_fill_keys(array_keys($fields), true));
} }
parent::beforeSendToClient($cname); parent::beforeSendToClient($cname);

27
etemplate/js/et2_extension_customfields.js
View File

@ -29,8 +29,7 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
}, },
'fields': { 'fields': {
'name': 'Custom fields', 'name': 'Custom fields',
'description': 'Auto filled', 'description': 'Auto filled'
"default": {}
}, },
'value': { 'value': {
'name': 'Custom fields', 'name': 'Custom fields',
@ -45,13 +44,15 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
} }
}, },
legacyOptions: ["type_filter"], legacyOptions: ["type_filter"], // Field restriction & private done server-side
prefix: '#', prefix: '#',
DEFAULT_ID: "custom_fields",
init: function() { init: function() {
// Some apps (infolog edit) don't give ID, so assign one to get settings // Some apps (infolog edit) don't give ID, so assign one to get settings
if(!arguments[1].id) arguments[1].id = "custom_fields"; if(!arguments[1].id) arguments[1].id = this.DEFAULT_ID;
this._super.apply(this, arguments); this._super.apply(this, arguments);
@ -64,6 +65,7 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
this.rows = {}; this.rows = {};
this.widgets = {}; this.widgets = {};
this.detachedNodes = []; this.detachedNodes = [];
if(!this.options.fields) this.options.fields = {};
if(this.options.type_filter && typeof this.options.type_filter == "string") if(this.options.type_filter && typeof this.options.type_filter == "string")
{ {
@ -71,9 +73,12 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
} }
if(this.options.type_filter) if(this.options.type_filter)
{ {
this.options.fields = {}; var already_filtered = !jQuery.isEmptyObject(this.options.fields);
for(var field_name in this.options.customfields) for(var field_name in this.options.customfields)
{ {
// Already excluded?
if(already_filtered && !this.options.fields[field_name]) continue;
if(!this.options.customfields[field_name].type2) if(!this.options.customfields[field_name].type2)
{ {
// No restrictions // No restrictions
@ -155,6 +160,11 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
{ {
id = "{" + this.id + "}" + "["+this.prefix + field_name+"]"; id = "{" + this.id + "}" + "["+this.prefix + field_name+"]";
} }
else if (this.id != this.DEFAULT_ID)
{
// Prefix this ID to avoid potential ID collisions
id = this.id + "["+id+"]";
}
// Avoid creating field twice // Avoid creating field twice
if(!this.rows[id]) if(!this.rows[id])
@ -222,7 +232,8 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
{ {
for(var key in data) for(var key in data)
{ {
if(global_data[key]) // Don't overwrite fields with global values
if(global_data[key] && key !== 'fields')
{ {
data[key] = jQuery.extend(true, {}, data[key], global_data[key]); data[key] = jQuery.extend(true, {}, data[key], global_data[key]);
} }
@ -284,7 +295,7 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
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 // Check if ID was missing
if(value == null && this.id == 'custom_fields' && this.getArrayMgr("content").getEntry(this.prefix + field_name)) if(value == null && this.id == this.DEFAULT_ID && this.getArrayMgr("content").getEntry(this.prefix + field_name))
{ {
value = this.getArrayMgr("content").getEntry(this.prefix + field_name); value = this.getArrayMgr("content").getEntry(this.prefix + field_name);
} }
@ -311,7 +322,7 @@ var et2_customfields_list = et2_valueWidget.extend([et2_IDetachedDOM, et2_IInput
*/ */
getValue: function() { getValue: function() {
// Not using an ID means we have to grab all the widget values, and put them where server knows to look // 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') if(this.id != this.DEFAULT_ID)
{ {
return null; return null;
} }