From 19d88b952d27a33a3a04f32c0e1c0b6298a73b18 Mon Sep 17 00:00:00 2001 From: Viktor Kovtun <viktor.kovtun@id.ethz.ch> Date: Mon, 16 Sep 2019 12:09:43 +0200 Subject: [PATCH] SSDM-8583 Made the move of projects work correctly. --- .../views/Shared/widgets/MoveEntityController.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Shared/widgets/MoveEntityController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Shared/widgets/MoveEntityController.js index 626958691bf..8759cb46eea 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Shared/widgets/MoveEntityController.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/Shared/widgets/MoveEntityController.js @@ -44,6 +44,9 @@ function MoveEntityController(entityType, entityPermId) { || (entity.getExperiment() && entity.getExperiment().getIdentifier().identifier === moveEntityModel.selected.getIdentifier().identifier); break; + case "PROJECT": + found = entity.getSpace().getPermId().identifier === moveEntityModel.selected.getPermId().identifier; + break; } if(!found) { @@ -65,6 +68,9 @@ function MoveEntityController(entityType, entityPermId) { case "DATASET": mainController.changeView("showViewDataSetPageFromPermId", entity.getPermId().permId); break; + case "PROJECT": + mainController.changeView("showProjectPageFromIdentifier", entity.getPermId().permId); + break; } }); } @@ -118,6 +124,14 @@ function MoveEntityController(entityType, entityPermId) { mainController.openbisV3.updateDataSets([ datasetUpdate ]).done(done).fail(fail); }); break; + case "PROJECT": + require(["as/dto/project/update/ProjectUpdate"], function (ProjectUpdate) { + var projectUpdate = new ProjectUpdate(); + projectUpdate.setProjectId(moveEntityModel.entity.getIdentifier()); + projectUpdate.setSpaceId(moveEntityModel.selected.getPermId()); + mainController.openbisV3.updateProjects([projectUpdate]).done(done).fail(fail); + }); + break; } } -- GitLab