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

History log:

Browse Source 
- Automatic support for custom fields
- Fix missing select-<subtype> values
This commit is contained in:
Nathan Gray 2012-05-30 18:47:32 +00:00
parent b6760edc22
commit 98c28030be
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etemplate/inc/class.etemplate_widget_historylog.inc.php
View File

@ -34,10 +34,11 @@ class etemplate_widget_historylog extends etemplate_widget
if(!is_array($type))
{
list($basetype) = explode('-',$type);
$widget = @self::factory($basetype, '<?xml version="1.0"?><'.$basetype.' type="'.$type.'"/>', $key);
$widget = @self::factory($basetype, '<?xml version="1.0"?><'.$type.' type="'.$type.'"/>', $key);
$widget->id = $key;
$widget->attrs['type'] = $type;
$widget->type = $type;
if(method_exists($widget, 'beforeSendToClient'))
{
$widget->beforeSendToClient($cname);

2
etemplate/inc/class.etemplate_widget_menupopup.inc.php
View File

@ -614,4 +614,4 @@ class etemplate_widget_menupopup extends etemplate_widget
}
}
etemplate_widget::registerWidget('etemplate_widget_menupopup', array('selectbox','listbox'));
etemplate_widget::registerWidget('etemplate_widget_menupopup', array('selectbox','listbox','select'));

37
etemplate/js/et2_widget_historylog.js
View File

@ -38,6 +38,9 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],{
{'id': 'new_value', caption: 'New Value'},
{'id': 'old_value', caption: 'Old Value'}
],
TIMESTAMP: 0, OWNER: 1, FIELD: 2, NEW_VALUE: 3, OLD_VALUE: 4,
init: function() {
this._super.apply(this, arguments);
this.div = $j(document.createElement("div"))
@ -178,6 +181,40 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],{
// Per-field widgets - new value & old value
this.fields = {};
// Custom fields - try to use an existing one
var cf_widget = null
var labels = {};
this.getRoot().iterateOver(function(widget) { cf_widget = widget;}, this, et2_customfields_list);
if(cf_widget == null)
{
cf_widget = et2_createWidget('customfields', {}, this);
}
for(var key in cf_widget.widgets)
{
// Add label
labels[cf_widget.prefix + key] = cf_widget.options.customfields[key].label;
// If it doesn't support detached nodes, just treat it as text
if(cf_widget.widgets[key].getDetachedNodes)
{
var nodes = cf_widget.widgets[key].getDetachedNodes();
for(var i = 0; i < nodes.length; i++)
{
if(nodes[i] == null) nodes.splice(i,1);
}
this.fields[cf_widget.prefix + key] = {
attrs: cf_widget.widgets[key].options,
widget: cf_widget.widgets[key],
nodes: jQuery(nodes)
};
}
}
// Add all cf labels
this.columns[this.FIELD].widget.set_select_options(labels);
// From app
for(var key in this.options.value['status-widgets'])
{
var field = this.options.value['status-widgets'][key];