From 3d3963f5c1a3500d98514c2325c3d93f81df271c Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Wed, 28 Aug 2019 11:51:02 +0300 Subject: [PATCH] Fixes bug on DMP editor model initializing Funder with null values. --- .../eu/eudat/models/data/dmp/DataManagementPlan.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java index 67d4eadc1..d018cab85 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlan.java @@ -252,13 +252,15 @@ public class DataManagementPlan implements DataModel { this.users = entity.getUsers().stream().map(item -> new UserInfoListingModel().fromDataModel(item)).collect(Collectors.toList()); this.doi = entity.getDoi(); - this.project = new Project(); - if (entity.getProject() != null) + if (entity.getProject() != null) { + this.project = new Project(); this.project = new Project().fromDataModel(entity.getProject()); + } - this.funder = new Funder(); - if (entity.getGrant().getFunder() != null) + if (entity.getGrant().getFunder() != null) { + this.funder = new Funder(); this.funder.fromDataModel(entity.getGrant().getFunder()); + } return this; }