From 08f7d4aca4722429422d4a2f31feccef5f05bbaa Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Mon, 29 Jun 2020 17:18:56 +0300 Subject: [PATCH] Fixed issue with DMP filter on public datasets --- .../criteria/dataset-criteria.component.ts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts index 55c7d6a8f..1656c6965 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.ts @@ -232,17 +232,21 @@ export class DatasetCriteriaComponent extends BaseCriteriaComponent implements O const fields: Array = new Array(); fields.push('asc'); - if (this.isPublic) { - const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); - dmpDataTableRequest.criteria = new ExploreDmpCriteriaModel(); - dmpDataTableRequest.criteria.like = value; - return this.dmpService.getPublicPaged(dmpDataTableRequest, "autocomplete"); - } else { + // if (this.isPublic) { + // const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); + // dmpDataTableRequest.criteria = new ExploreDmpCriteriaModel(); + // dmpDataTableRequest.criteria.like = value; + // return this.dmpService.getPublicPaged(dmpDataTableRequest, "autocomplete"); + // } else { const dmpDataTableRequest: DataTableRequest = new DataTableRequest(0, null, { fields: fields }); dmpDataTableRequest.criteria = new DmpCriteria(); dmpDataTableRequest.criteria.like = value; - return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete"); + if (this.isPublic) { + dmpDataTableRequest.criteria.isPublic = true; + dmpDataTableRequest.criteria.onlyPublic = true; } + return this.dmpService.getPaged(dmpDataTableRequest, "autocomplete"); + // } } filterGrant(query: string) {