From 444f98fe34edc40e6609111d37859fd8e2b67ff8 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 10 Feb 2020 14:13:46 -0700 Subject: [PATCH] Fix first repeating row had no widgets --- api/js/etemplate/et2_core_arrayMgr.js | 2 +- api/js/etemplate/et2_core_arrayMgr.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/js/etemplate/et2_core_arrayMgr.js b/api/js/etemplate/et2_core_arrayMgr.js index 5b6029d423..94ffe714c6 100644 --- a/api/js/etemplate/et2_core_arrayMgr.js +++ b/api/js/etemplate/et2_core_arrayMgr.js @@ -209,7 +209,7 @@ var et2_arrayMgr = /** @class */ (function () { var pos_var = _ident.indexOf('$'); if (pos_var >= 0 && (this.perspectiveData.row != null || !_ident.match(/\$\{?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] || {}; // $cont is NOT root but current name-space in old eTemplate var cont = this.data; //getRoot().data; diff --git a/api/js/etemplate/et2_core_arrayMgr.ts b/api/js/etemplate/et2_core_arrayMgr.ts index 29e91e47e4..771bec3a0e 100644 --- a/api/js/etemplate/et2_core_arrayMgr.ts +++ b/api/js/etemplate/et2_core_arrayMgr.ts @@ -227,7 +227,7 @@ export class et2_arrayMgr const pos_var = _ident.indexOf('$'); if (pos_var >= 0 && (this.perspectiveData.row != null || !_ident.match(/\$\{?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] || {}; // $cont is NOT root but current name-space in old eTemplate const cont = this.data;//getRoot().data;