From aa930f097a3bfdf17144e0e6ada709d39138a019 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Fri, 10 Jul 2020 16:30:44 +0300 Subject: [PATCH] Fixed issue with DMPs that are having a user assigned multiple times --- .../eu/eudat/logic/managers/DataManagementPlanManager.java | 4 ++++ 1 file changed, 4 insertions(+) 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 5b6d640a2..bb659dcd6 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 @@ -155,6 +155,7 @@ public class DataManagementPlanManager { if (fieldsGroup.equals("listing")) { if (!dataManagementPlanTableRequest.getCriteria().isOnlyPublic()) { itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class)) + .distinct() .selectAsync(item -> { item.setDataset( item.getDataset().stream() @@ -168,6 +169,7 @@ public class DataManagementPlanManager { .whenComplete((resultList, throwable) -> dataTable.setData(resultList)); } else { itemsFuture = pagedItems.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class)) + .distinct() .selectAsync(item -> { item.setDataset( item.getDataset().stream() @@ -178,10 +180,12 @@ public class DataManagementPlanManager { } } else if (fieldsGroup.equals("autocomplete")) { itemsFuture = pagedItems + .distinct() .selectAsync(item -> new DataManagementPlanListingModel().fromDataModelAutoComplete(item)) .whenComplete((resultList, throwable) -> dataTable.setData(resultList)); } else { itemsFuture = pagedItems + .distinct() .selectAsync(item -> new DataManagementPlanListingModel().fromDataModelAssociatedProfiles(item)) .whenComplete((resultList, throwable) -> dataTable.setData(resultList)); }