From 3d7e31e145705244b914b91cfb107b5c88058237 Mon Sep 17 00:00:00 2001
From: gkolokythas <gkolokythas@cite.gr>
Date: Fri, 7 Jun 2019 16:35:49 +0300
Subject: [PATCH] Fixes bug on Public DMP editing exposing not "Finalized"
 Datasets.

---
 .../eu/eudat/logic/managers/DataManagementPlanManager.java     | 3 ++-
 1 file changed, 2 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 ba5eaa2e5..408b65f93 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
@@ -135,7 +135,7 @@ public class DataManagementPlanManager {
                     .selectAsync(item -> {
                         item.setDataset(
                                 item.getDataset().stream()
-                                        .filter(dataset -> dataset.isPublic()).collect(Collectors.toSet()));
+                                        .filter(dataset -> dataset.getStatus().equals(Dataset.Status.FINALISED.getValue())).collect(Collectors.toSet()));
                         return new DataManagementPlanListingModel().fromDataModelDatasets(item);
                     })
                     .whenComplete((resultList, throwable) -> dataTable.setData(resultList));
@@ -326,6 +326,7 @@ public class DataManagementPlanManager {
         if (dataManagementPlanEntity != null && dataManagementPlanEntity.getStatus() == 1){
             eu.eudat.models.data.dmp.DataManagementPlan datamanagementPlan = new eu.eudat.models.data.dmp.DataManagementPlan();
             datamanagementPlan.fromDataModel(dataManagementPlanEntity);
+            datamanagementPlan.setDatasets(datamanagementPlan.getDatasets().stream().filter(dataset -> dataset.getStatus() == Dataset.Status.FINALISED.getValue()).collect(Collectors.toList()));
             Map dmpProperties = dataManagementPlanEntity.getDmpProperties() != null ? new org.json.JSONObject(dataManagementPlanEntity.getDmpProperties()).toMap() : null;
             datamanagementPlan.setDynamicFields(dynamicProjectConfiguration.getFields().stream().map(item -> {
                 DynamicFieldWithValue fieldWithValue = new DynamicFieldWithValue();