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

Fix first repeating row had no widgets

Browse Source
This commit is contained in:
nathangray 2020-02-10 14:13:46 -07:00
parent 39590368bf
commit 444f98fe34
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/js/etemplate/et2_core_arrayMgr.js
View File

@ -209,7 +209,7 @@ var et2_arrayMgr = /** @class */ (function () {
var pos_var = _ident.indexOf('$'); var pos_var = _ident.indexOf('$');
if (pos_var >= 0 && (this.perspectiveData.row != null || !_ident.match(/\$\{?row\}?/))) { if (pos_var >= 0 && (this.perspectiveData.row != null || !_ident.match(/\$\{?row\}?/))) {
// Get the content array for the current row // Get the content array for the current row
var row = this.perspectiveData.row || ''; var row = typeof this.perspectiveData.row == 'number' ? this.perspectiveData.row : '';
var row_cont = this.data[row] || {}; var row_cont = this.data[row] || {};
// $cont is NOT root but current name-space in old eTemplate // $cont is NOT root but current name-space in old eTemplate
var cont = this.data; //getRoot().data; var cont = this.data; //getRoot().data;

2
api/js/etemplate/et2_core_arrayMgr.ts
View File

@ -227,7 +227,7 @@ export class et2_arrayMgr
const pos_var = _ident.indexOf('$'); const pos_var = _ident.indexOf('$');
if (pos_var >= 0 && (this.perspectiveData.row != null || !_ident.match(/\$\{?row\}?/))) { if (pos_var >= 0 && (this.perspectiveData.row != null || !_ident.match(/\$\{?row\}?/))) {
// Get the content array for the current row // Get the content array for the current row
const row = this.perspectiveData.row || ''; const row = typeof this.perspectiveData.row == 'number' ? this.perspectiveData.row : '';
const row_cont = this.data[row] || {}; const row_cont = this.data[row] || {};
// $cont is NOT root but current name-space in old eTemplate // $cont is NOT root but current name-space in old eTemplate
const cont = this.data;//getRoot().data; const cont = this.data;//getRoot().data;