From 90d1648ee210e98d25c1e56f34cc97f6121ddcaf Mon Sep 17 00:00:00 2001 From: felmer <franz-josef.elmer@id.ethz.ch> Date: Wed, 15 Jul 2020 10:47:53 +0200 Subject: [PATCH] SSDM-9998: replace code DUMMY by __DUMMY_FOR_RIGHTS_CALCULATION__ in order to fix the bug. --- .../1/as/webapps/eln-lims/html/js/util/IdentifierUtil.js | 2 +- .../eln-lims/html/js/views/ProjectForm/ProjectFormController.js | 2 +- .../eln-lims/html/js/views/SpaceForm/SpaceFormController.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/IdentifierUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/IdentifierUtil.js index f4143903670..baf1b26a64a 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/IdentifierUtil.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/IdentifierUtil.js @@ -83,6 +83,6 @@ var IdentifierUtil = new function() { this.createDummySampleIdentifierFromExperimentIdentifier = function(experimentIdentifier) { var spaceCode = this.getSpaceCodeFromIdentifier(experimentIdentifier); var projectCode = this.getProjectCodeFromExperimentIdentifier(experimentIdentifier); - return "/" + spaceCode + "/" + projectCode + "/DUMMY"; + return "/" + spaceCode + "/" + projectCode + "/__DUMMY_FOR_RIGHTS_CALCULATION__"; } } \ No newline at end of file diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormController.js index 880799b791b..f9e9aa6a8a8 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormController.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ProjectForm/ProjectFormController.js @@ -37,7 +37,7 @@ function ProjectFormController(mainController, mode, project) { project: projectCode, }, function(roles){ _this._projectFormModel.roles = roles; - var dummyId = new ExperimentIdentifier("/" + spaceCode + "/" + projectCode + "/DUMMY"); + var dummyId = new ExperimentIdentifier("/" + spaceCode + "/" + projectCode + "/__DUMMY_FOR_RIGHTS_CALCULATION__"); mainController.openbisV3.getRights([id, dummyId], new RightsFetchOptions()).done(function(rightsByIds) { _this._projectFormModel.rights = rightsByIds[id]; _this._projectFormModel.experimentRights = rightsByIds[dummyId]; diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormController.js index 72ae9c56d75..323efd833db 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormController.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SpaceForm/SpaceFormController.js @@ -33,7 +33,7 @@ function SpaceFormController(mainController, space) { space: space }, function(roles){ _this._spaceFormModel.roles = roles; - var dummyId = new ProjectIdentifier("/" + space + "/DUMMY"); + var dummyId = new ProjectIdentifier("/" + space + "/__DUMMY_FOR_RIGHTS_CALCULATION__"); mainController.openbisV3.getRights([id, dummyId], new RightsFetchOptions()).done(function(rightsByIds) { _this._spaceFormModel.projectRights = rightsByIds[dummyId]; _this._spaceFormView.repaint(views); -- GitLab