From 1d05c73745cce3c695f1e41f062a98c94be244a0 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Tue, 17 Mar 2020 17:10:14 +0200
Subject: [PATCH] Even more bugfixes

---
 .../main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java    | 2 +-
 .../dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java
index 4a238a953..f6b8d5b7f 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/DatasetDaoImpl.java
@@ -32,7 +32,7 @@ public class DatasetDaoImpl extends DatabaseAccess<Dataset> implements DatasetDa
     @Override
     public QueryableList<Dataset> getWithCriteria(DatasetCriteria criteria) {
         QueryableList<Dataset> query = getDatabaseService().getQueryable(Dataset.getHints(), Dataset.class);
-        if (criteria.getIsPublic()) {
+        if (criteria.getIsPublic() != null && criteria.getIsPublic()) {
             query.where((builder, root) -> builder.equal(root.get("dmp").get("isPublic"), true));
             query.where((builder, root) -> builder.equal(root.get("status"), Dataset.Status.FINALISED.getValue()));
             query.initSubQuery(String.class).where((builder, root) -> builder.equal(root.get("dmp").get("version"),
diff --git a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts
index 210b7034b..351dea94f 100644
--- a/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts
+++ b/dmp-frontend/src/app/ui/dmp/wizard/listing/dmp-wizard-dataset-listing.component.ts
@@ -64,6 +64,7 @@ export class DmpWizardDatasetListingComponent extends BaseComponent implements O
 		const request: DataTableRequest<DatasetCriteria> = new DataTableRequest<DatasetCriteria>(null, null, null);
 		request.criteria = new DatasetCriteria();
 		request.criteria.dmpIds = [this.dmpId];
+		request.criteria.allVersions = true;
 		this.datasetService.getPaged(request)
 			.pipe(takeUntil(this._destroyed))
 			.subscribe(items => {