From ba36dd06ecbff1e539f03e5b2b1164fb2b3aa70f Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Tue, 2 Apr 2019 13:45:47 +0300 Subject: [PATCH] Fixes Project status selector on explore --- .../wizard/editor/dmp-wizard-editor.component.html | 6 +++--- .../filters/explore-dataset-filters.component.ts | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.html b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.html index 768d1df14..bc2f4e72b 100644 --- a/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.html +++ b/dmp-frontend/src/app/ui/dmp/wizard/editor/dmp-wizard-editor.component.html @@ -24,8 +24,8 @@ + placeholder="{{'DMP-EDITOR.FIELDS.DESCRIPTION' | translate}}" formControlName="description"> + {{formGroup.get('description').getError('backendError').message}} @@ -83,4 +83,4 @@ - \ No newline at end of file + diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts index def4be3a3..ef0cecb0e 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.ts @@ -16,6 +16,7 @@ import { ExternalSourcesService } from '../../../core/services/external-sources/ import { ProjectService } from '../../../core/services/project/project.service'; import { RequestItem } from '../../../core/query/request-item'; import { DataTableRequest } from '../../../core/model/data-table/data-table-request'; +import { AuthService } from '../../../core/services/auth/auth.service'; @Component({ selector: 'app-explore-dataset-filters-component', @@ -60,7 +61,8 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI public projectService: ProjectService, public languageService: TranslateService, public datasetProfileService: DatasetService, - public externalSourcesService: ExternalSourcesService + public externalSourcesService: ExternalSourcesService, + private authentication: AuthService, ) { super(); } ngOnInit() { @@ -96,10 +98,14 @@ export class ExploreDatasetFiltersComponent extends BaseComponent implements OnI dataTableRequest.criteria = new ProjectCriteria(); dataTableRequest.criteria.projectStateType = this.facetCriteria.projectStatus; dataTableRequest.criteria['length'] = 10; - this.projects = this.projectService.getPaged(dataTableRequest, "autocomplete").map(x => x.data); - this.facetCriteria.projects = []; + + if (this.authentication.current()) { + this.projects = this.projectService.getPaged(dataTableRequest, "autocomplete").map(x => x.data); + this.facetCriteria.projects = []; + } } this.facetCriteriaChange.emit(this.facetCriteria); + } public projectChanged(event: any) {