extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-28 16:12:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Accept status labels in different ID, only pass needed attributes to dataview to avoid warnings

Browse Source
This commit is contained in:
Nathan Gray 2012-07-25 20:56:05 +00:00
parent 46421450f2
commit 599008754d
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
etemplate/js/et2_widget_historylog.js
View File

@ -34,15 +34,20 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],{
attributes: { attributes: {
"value": { "value": {
"type": "any" "type": "any"
},
"status_id":{
"type": "string",
"default": "status"
} }
}, },
legacyOptions: ["status_id"],
columns: [ columns: [
{'id': 'user_ts', caption: 'Date', 'width': '120px', widget_type: 'date-time'}, {'id': 'user_ts', caption: 'Date', 'width': '120px', widget_type: 'date-time'},
{'id': 'owner', caption: 'User', 'width': '150px', widget_type: 'select-account'}, {'id': 'owner', caption: 'User', 'width': '150px', widget_type: 'select-account'},
{'id': 'status', caption: 'Changed', 'width': '120px', widget_type: 'select'}, {'id': 'status', caption: 'Changed', 'width': '120px', widget_type: 'select'},
{'id': 'new_value', caption: 'New Value'}, {'id': 'new_value', caption: 'New Value', 'width': 'auto'},
{'id': 'old_value', caption: 'Old Value'} {'id': 'old_value', caption: 'Old Value', 'width': 'auto'}
], ],
TIMESTAMP: 0, OWNER: 1, FIELD: 2, NEW_VALUE: 3, OLD_VALUE: 4, TIMESTAMP: 0, OWNER: 1, FIELD: 2, NEW_VALUE: 3, OLD_VALUE: 4,
@ -56,6 +61,10 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],{
.appendTo(this.div); .appendTo(this.div);
}, },
set_status_id: function(_new_id) {
this.options.status_id = _new_id;
},
doLoadingFinished: function() { doLoadingFinished: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
@ -110,7 +119,12 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],{
// Create the outer grid container // Create the outer grid container
this.dataview = new et2_dataview(this.innerDiv, this.egw()); this.dataview = new et2_dataview(this.innerDiv, this.egw());
this.dataview.setColumns(jQuery.extend(true, [],this.columns)); var dataview_columns = [];
for (var i = 0; i < this.columns.length; i++)
{
dataview_columns[i] = {"id": this.columns[i].id, "caption": this.columns[i].caption, "width":this.columns[i].width};
}
this.dataview.setColumns(dataview_columns);
// Create widgets for columns that stay the same, and set up varying widgets // Create widgets for columns that stay the same, and set up varying widgets
this.createWidgets(); this.createWidgets();
@ -174,7 +188,8 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],{
{ {
if(this.columns[i].widget_type) if(this.columns[i].widget_type)
{ {
var attrs = {'readonly': true, 'id': this.columns[i].id}; // Status ID is allowed to be remapped to something else. Only affects the widget ID though
var attrs = {'readonly': true, 'id': (i == this.FIELD ? this.options.status_id : this.columns[i].id)};
this.columns[i].widget = et2_createWidget(this.columns[i].widget_type, attrs, this); this.columns[i].widget = et2_createWidget(this.columns[i].widget_type, attrs, this);
this.columns[i].widget.transformAttributes(attrs); this.columns[i].widget.transformAttributes(attrs);
this.columns[i].nodes = $j(this.columns[i].widget.getDetachedNodes()); this.columns[i].nodes = $j(this.columns[i].widget.getDetachedNodes());
@ -198,8 +213,9 @@ var et2_historylog = et2_valueWidget.extend([et2_IDataProvider],{
// Per-field widgets - new value & old value // Per-field widgets - new value & old value
this.fields = {}; this.fields = {};
var labels = this.columns[this.FIELD].widget.optionValues;
// Custom fields - Need to create one that's all read-only for proper display // Custom fields - Need to create one that's all read-only for proper display
var labels = {};
var cf_widget = et2_createWidget('customfields', {'readonly':true}, this); var cf_widget = et2_createWidget('customfields', {'readonly':true}, this);
cf_widget.loadFields(); cf_widget.loadFields();
// Override this or it may damage the real values // Override this or it may damage the real values