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

Fix bug in nm rowProvider preventing some re-ordered columns from getting their value

Browse Source
This commit is contained in:
nathangray 2020-03-17 10:24:24 -06:00
parent 5fecbf3051
commit 83fd11f7c7
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
api/js/etemplate/et2_extension_nextmatch_rowProvider.js
View File

@ -218,7 +218,7 @@ var et2_nextmatch_rowProvider = /** @class */ (function () {
* @param {et2_widget} _widget
*/
et2_nextmatch_rowProvider.prototype._getVariableAttributeSet = function (_widget) {
var variableAttributes = [];
var variableAttributes = [];
var process = function (_widget) {
// Create the attribtues
var hasAttr = false;
@ -230,11 +230,11 @@ var et2_nextmatch_rowProvider = /** @class */ (function () {
for (var key in _widget.attributes) {
if (!_widget.attributes[key].ignore &&
typeof _widget.options[key] != "undefined") {
var val = _widget.options[key];
// TODO: Improve detection
if (typeof val == "string" && val.indexOf("$") >= 0) {
hasAttr = true;
widgetData.data.push({
var val = _widget.options[key];
// TODO: Improve detection
if (typeof val == "string" && val.indexOf("$") >= 0) {
hasAttr = true;
widgetData.data.push({
"attribute": key,
"expression": val
});
@ -247,26 +247,26 @@ var et2_nextmatch_rowProvider = /** @class */ (function () {
}
};
// Check each column
var columns = _widget.getChildren();
var columns = _widget._widgets;
for (var i = 0; i < columns.length; i++) {
// If column is hidden, don't process it
if (this._context && this._context.columns && this._context.columns[i] && !this._context.columns[i].visible) {
if (typeof columns[i] === 'undefined' || this._context && this._context.columns && this._context.columns[i] && !this._context.columns[i].visible) {
continue;
}
columns[i].iterateOver(process, this);
}
return variableAttributes;
};
et2_nextmatch_rowProvider.prototype._seperateWidgets = function (_varAttrs) {
// The detachable array contains all widgets which implement the
// et2_IDetachedDOM interface for all needed attributes
var detachable = [];
// The remaining array creates all widgets which have to be completely
// cloned when the widget tree is created
var remaining = [];
// Iterate over the widgets
for (var i = 0; i < _varAttrs.length; i++) {
var widget = _varAttrs[i].widget;
et2_nextmatch_rowProvider.prototype._seperateWidgets = function (_varAttrs) {
// The detachable array contains all widgets which implement the
// et2_IDetachedDOM interface for all needed attributes
var detachable = [];
// The remaining array creates all widgets which have to be completely
// cloned when the widget tree is created
var remaining = [];
// Iterate over the widgets
for (var i = 0; i < _varAttrs.length; i++) {
var widget = _varAttrs[i].widget;
// Check whether the widget parents are not allready in the "remaining"
// slot - if this is the case do not include the widget at all.
var insertWidget = true;
@ -490,8 +490,8 @@ var et2_nextmatch_rowWidget = /** @class */ (function (_super) {
this._row.childNodes[row_id].align = this._widgets[i].align;
}
row_id++;
}
};
}
};
/**
* Returns the column node for the given sender
*

4
api/js/etemplate/et2_extension_nextmatch_rowProvider.ts
View File

@ -297,11 +297,11 @@ export class et2_nextmatch_rowProvider
};
// Check each column
const columns = _widget.getChildren();
const columns = _widget._widgets;
for (var i = 0; i < columns.length; i++)
{
// If column is hidden, don't process it
if(this._context && this._context.columns && this._context.columns[i] && !this._context.columns[i].visible)
if(typeof columns[i] === 'undefined' || this._context && this._context.columns && this._context.columns[i] && !this._context.columns[i].visible)
{
continue;
}