|
|
|
@ -179,7 +179,6 @@ public class DataManagementPlanManager {
|
|
|
|
|
|
|
|
|
|
DataTableData<DataManagementPlanListingModel> dataTable = new DataTableData<>();
|
|
|
|
|
|
|
|
|
|
CompletableFuture itemsFuture;
|
|
|
|
|
if (fieldsGroup.equals("listing")) {
|
|
|
|
|
if (!dataManagementPlanTableRequest.getCriteria().isOnlyPublic()) {
|
|
|
|
|
List<DMP> dmps1 = items.withHint(HintedModelFactory.getHint(DataManagementPlanListingModel.class))
|
|
|
|
@ -249,7 +248,8 @@ public class DataManagementPlanManager {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private Set<Dataset> retrieveRelevantDatasets (DatasetCriteria datasetCriteria, UUID principal) {
|
|
|
|
|
QueryableList<Dataset> datasetItems = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().getWithCriteria(datasetCriteria);
|
|
|
|
|
QueryableList<Dataset> datasetItems = apiContext.getOperationsContext().getDatabaseRepository().getDatasetDao().getWithCriteria(datasetCriteria)
|
|
|
|
|
.orderBy((builder, root) -> builder.desc(root.get("modified")));
|
|
|
|
|
if (principal != null) {
|
|
|
|
|
UserInfo userInfo = apiContext.getOperationsContext().getDatabaseRepository().getUserInfoDao().find(principal);
|
|
|
|
|
List<Integer> roles = new ArrayList<>();
|
|
|
|
|