From 303087f87aecb7f0192d57a12a0f49e6fcd7c3e5 Mon Sep 17 00:00:00 2001
From: Flavio Tarsetti <Flavio.Tarsetti@idiap.ch>
Date: Wed, 23 Mar 2016 09:36:47 +0100
Subject: [PATCH] [reports] on multiple aliasing change without save avoid
confusion with real names. Fixes #422
---
.../static/reports/app/controllers/reportController.js | 2 ++
.../reports/static/reports/app/directives/reportItemView.js | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/beat/web/reports/static/reports/app/controllers/reportController.js b/beat/web/reports/static/reports/app/controllers/reportController.js
index cce7c76d9..751359cdb 100644
--- a/beat/web/reports/static/reports/app/controllers/reportController.js
+++ b/beat/web/reports/static/reports/app/controllers/reportController.js
@@ -449,11 +449,13 @@ app.controller('reportController',['$scope', 'reportFactory', 'experimentFactory
function setExperimentAlias(experiment_id)
{
$scope.report_experiments_alias[experiment_id] = experiment_id.split("/").pop();
+ $scope.report_experiments_alias_from_content[experiment_id] = experiment_id.split("/").pop();
}
function setExperimentAliasFromContent(experiment_id, experiment_alias)
{
$scope.report_experiments_alias[experiment_id] = experiment_alias;
+ $scope.report_experiments_alias_from_content[experiment_id] = experiment_alias;
}
function unique(list)
diff --git a/beat/web/reports/static/reports/app/directives/reportItemView.js b/beat/web/reports/static/reports/app/directives/reportItemView.js
index 88ba7b8e1..92d9a994e 100644
--- a/beat/web/reports/static/reports/app/directives/reportItemView.js
+++ b/beat/web/reports/static/reports/app/directives/reportItemView.js
@@ -103,6 +103,11 @@ app.directive("savereportitems", function($compile)
mydict["experiments"] = scope.report.experiments;
mydict["content"] = savecontent;
+ for(var i = 0; i < scope.report.experiments.length; i++)
+ {
+ scope.report_experiments_alias_from_content[scope.report.experiments[i]] = scope.report_experiments_alias[scope.report.experiments[i]];
+ }
+
updateReport(mydict);
});
@@ -1767,7 +1772,6 @@ app.directive("aliasexperiment", function($compile)
function createAlias(experiment_name, alias_name)
{
- scope.report_experiments_alias_from_content[experiment_name] = scope.report_experiments_alias[experiment_name];
scope.report_experiments_alias[experiment_name] = alias_name;
scope.$parent.$parent.$parent.$parent.report_experiments_alias[experiment_name] = alias_name;
--
GitLab