From cba7ae4335ed057f98bb636f4ca1164714315d7d Mon Sep 17 00:00:00 2001
From: Jaden Diefenbaugh <blakcap@users.noreply.github.com>
Date: Mon, 24 Apr 2017 11:17:30 +0200
Subject: [PATCH] properly use alias instead of full expName when generated
tables, fixes report lock bug
---
.../reports/static/reports/app/directives/tableItem.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/beat/web/reports/static/reports/app/directives/tableItem.js b/beat/web/reports/static/reports/app/directives/tableItem.js
index 20ccdc16a..9a9ee7ab5 100644
--- a/beat/web/reports/static/reports/app/directives/tableItem.js
+++ b/beat/web/reports/static/reports/app/directives/tableItem.js
@@ -72,11 +72,14 @@ angular.module('reportApp')
};
// gets the field val for the given exp
scope.getFieldVal = (expName, field) => {
- let fVal = scope.tableables[expName] ?
- scope.tableables[expName][field] : undefined;
+ const alias = scope.group.aliases[expName].length > 0 ? scope.group.aliases[expName] : expName;
+
+ let fVal = scope.tableables[alias] ?
+ scope.tableables[alias][field] : undefined;
let val;
+
if(field === scope.fields[0]){
- val = scope.group.aliases[expName].length > 0 ? scope.group.aliases[expName] : expName;
+ val = alias;
} else if(!fVal){
val = '-';
} else {
--
GitLab