From c5d00b9ba1d2e27ffcc01925660bdfc3f7ae8ce4 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Fri, 21 Jun 2019 12:31:15 +0300 Subject: [PATCH] Fixes bug on enabling a Finalized DMP to be made Draft again. --- .../eu/eudat/logic/managers/DataManagementPlanManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java index 4d00947d6..3e6ed5736 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DataManagementPlanManager.java @@ -424,9 +424,12 @@ public class DataManagementPlanManager { createOrganisationsIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getOrganisationDao()); createResearchersIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getResearcherDao()); createProjectIfItDoesntExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getProjectDao(), user); + DMP dmp = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(dataManagementPlan.getId()); + if (dmp.getStatus().equals(DMP.DMPStatus.FINALISED.getValue())) + newDmp.setStatus(DMP.DMPStatus.FINALISED.getValue()); + try { - DMP dmp = apiContext.getOperationsContext().getDatabaseRepository().getDmpDao().find(dataManagementPlan.getId()); newDmp.setCreated(dmp.getCreated()); if (dmp.getUsers().stream().filter(userInfo -> userInfo.getUser().getId() == principal.getId()) .collect(Collectors.toList()).size() == 0) {