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

Etemplate: historylog - get diff to work as part of multi-part entries

Browse Source
This commit is contained in:
nathangray 2019-09-17 15:19:55 -06:00
parent e1fd1197ec
commit 0d34650a7d
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
api/js/etemplate/et2_widget_historylog.js
View File

@ -557,8 +557,12 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
value = _data['share_email']; value = _data['share_email'];
} }
// Get widget from list, unless it needs a diff widget // Get widget from list, unless it needs a diff widget
if(typeof widget == 'undefined' && typeof self.fields[_data.status] != 'undefined' && (i < self.NEW_VALUE || if(typeof widget == 'undefined' && typeof self.fields[_data.status] != 'undefined' && (
i >= self.NEW_VALUE &&!self._needsDiffWidget(_data['status'], _data[self.columns[self.OLD_VALUE].id]))) i < self.NEW_VALUE ||
i >= self.NEW_VALUE && (
self.fields[_data.status].nodes || !self._needsDiffWidget(_data['status'], _data[self.columns[self.OLD_VALUE].id])
)
))
{ {
widget = self.fields[_data.status].widget; widget = self.fields[_data.status].widget;
if(!widget._children.length) if(!widget._children.length)
@ -568,6 +572,10 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
for(var j = 0; j < widget._children.length; j++) for(var j = 0; j < widget._children.length; j++)
{ {
nodes.push(self.fields[_data.status].nodes[j].clone()); nodes.push(self.fields[_data.status].nodes[j].clone());
if(widget._children[j].instanceOf(et2_diff))
{
self._spanValueColumns(jQuery(this));
}
} }
} }
else if (widget) else if (widget)
@ -592,18 +600,12 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
widget = self.diff.widget; widget = self.diff.widget;
nodes = self.diff.nodes.clone(); nodes = self.diff.nodes.clone();
// Skip column 4
jthis.parents("td").attr("colspan", 2)
.css("border-right", "none");
jthis.css("width", (self.dataview.columnMgr.columnWidths[i] + self.dataview.columnMgr.columnWidths[i+1]-10)+'px');
if(widget) widget.setDetachedAttributes(nodes, { if(widget) widget.setDetachedAttributes(nodes, {
value: value, value: value,
label: jthis.parents("td").prev().text() label: jthis.parents("td").prev().text()
}); });
// Skip column 4 self._spanValueColumns(jthis);
jthis.parents("td").next().remove();
} }
} }
else else
@ -654,6 +656,25 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
return value === '***diff***'; return value === '***diff***';
}, },
/**
* Make a single row's new value cell span across both new value and old value
* columns. Used for diff widget.
*
* @param {jQuery} row jQuery wrapped row node
*/
_spanValueColumns: function(row)
{
// Stretch column 4
row.parents("td").attr("colspan", 2)
.css("border-right", "none");
row.css("width", (
this.dataview.columnMgr.columnWidths[this.NEW_VALUE] +
this.dataview.columnMgr.columnWidths[this.OLD_VALUE]-10)+'px');
// Skip column 5
row.parents("td").next().remove();
},
resize: function (_height) resize: function (_height)
{ {
if (typeof this.options != 'undefined' && _height if (typeof this.options != 'undefined' && _height