From 8ad6a8f1581cc508a55cb04d81d314589d166a22 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Thu, 22 Aug 2019 17:15:16 +0300 Subject: [PATCH] Fixes bug on not checking validation rules of a new Finalized DMP. (Issue #131) --- .../eu/eudat/logic/managers/DataManagementPlanManager.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 f127aa622..51756def3 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 @@ -420,13 +420,12 @@ public class DataManagementPlanManager { } if (dataManagementPlan.getStatus() == (int) DMP.DMPStatus.FINALISED.getValue() && dmp1.getStatus().equals(DMP.DMPStatus.FINALISED.getValue())) throw new Exception("DMP is finalized, therefore cannot be edited."); - - if(dataManagementPlan.getStatus() == (int) DMP.DMPStatus.FINALISED.getValue()) { - checkDmpValidationRules(dmp1); - } } DMP newDmp = dataManagementPlan.toDataModel(); + if (newDmp.getStatus() == (int) DMP.DMPStatus.FINALISED.getValue()) { + checkDmpValidationRules(newDmp); + } UserInfo user = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal.getId()); createOrganisationsIfTheyDontExist(newDmp, apiContext.getOperationsContext().getDatabaseRepository().getOrganisationDao());