From 71aea010a95afd8cbc8c063ee4e8b06c8d209246 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Wed, 28 Aug 2019 11:52:07 +0300
Subject: [PATCH] Fixes DMP editor's Funder updating mechanics.

---
 .../dmp/DataManagementPlanEditorModel.java     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
index 545fb1954..86ed120b7 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dmp/DataManagementPlanEditorModel.java
@@ -293,10 +293,14 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
             }
         }
 
-        if (this.funder != null && this.funder.getExistFunder() != null) {
-            if (this.funder.getExistFunder() != null && this.funder.getLabel() == null)
-                dataManagementPlanEntity.getGrant().setFunder(this.funder.getExistFunder().toDataModel());
-            else {
+        if(this.funder == null && this.funder.getExistFunder() == null && this.funder.getLabel() == null) {
+            dataManagementPlanEntity.getGrant().setFunder(null);
+        }
+        else if (this.funder != null && this.funder.getExistFunder() == null && this.funder.getLabel() == null) {
+            dataManagementPlanEntity.getGrant().setFunder(null);
+        }
+        else {
+            if (this.funder.getLabel() != null) {
                 Funder funder = new Funder();
                 funder.setLabel(this.funder.getLabel());
                 funder.setType(Funder.FunderType.INTERNAL.getValue());
@@ -308,9 +312,9 @@ public class DataManagementPlanEditorModel implements DataModel<DMP, DataManagem
 
                 dataManagementPlanEntity.getGrant().setFunder(funder);
             }
-        }
-        else {
-            dataManagementPlanEntity.getGrant().setFunder(null);
+            else if (this.funder.getExistFunder() != null && this.funder.getLabel() == null){
+                dataManagementPlanEntity.getGrant().setFunder(this.funder.getExistFunder().toDataModel());
+            }
         }
 
         if (this.project != null) {