diff --git a/deposit/depositFirstPage.component.ts b/deposit/depositFirstPage.component.ts index 0fbc1b9a..09430230 100644 --- a/deposit/depositFirstPage.component.ts +++ b/deposit/depositFirstPage.component.ts @@ -17,7 +17,7 @@ import {FullScreenModalComponent} from '../utils/modal/full-screen-modal/full-sc template: `
-
+
diff --git a/searchPages/searchUtils/newSearchPage.component.ts b/searchPages/searchUtils/newSearchPage.component.ts index 87774787..2b195b5f 100644 --- a/searchPages/searchUtils/newSearchPage.component.ts +++ b/searchPages/searchUtils/newSearchPage.component.ts @@ -1,4 +1,14 @@ -import {ChangeDetectorRef, Component, ElementRef, Input, Output, ViewChild} from '@angular/core'; +import { + ChangeDetectorRef, + Component, + ElementRef, + Input, + OnChanges, + OnDestroy, + OnInit, + Output, SimpleChanges, + ViewChild +} from '@angular/core'; import {Location} from '@angular/common'; import {ActivatedRoute, Router} from '@angular/router'; import {Meta, Title} from '@angular/platform-browser'; @@ -36,7 +46,7 @@ declare var UIkit: any; selector: 'new-search-page', templateUrl: 'newSearchPage.component.html' }) -export class NewSearchPageComponent { +export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges { @ViewChild('mobileFilters') mobileFilters: ElementRef; @Input() piwikSiteId = null; @Input() hasPrefix: boolean = true; @@ -228,6 +238,11 @@ export class NewSearchPageComponent { }); } + ngOnChanges(changes: SimpleChanges) { + this.cdr.detectChanges(); + } + + get disabled() { return this.disableForms || this.disableRefineForms; } diff --git a/utils/properties/searchFields.ts b/utils/properties/searchFields.ts index 5b8cf21a..55b105b3 100644 --- a/utils/properties/searchFields.ts +++ b/utils/properties/searchFields.ts @@ -72,7 +72,7 @@ export class SearchFields { equalityOperator: "=", filterType: null }, - ["pid"]: {name: "PID", type: "keyword", param: "pid", operator: "pd", equalityOperator: " = ", filterType: null}, + ["pid"]: {name: "PID", type: "keyword", param: "pid", operator: "pd", equalityOperator: " exact ", filterType: null}, ["resulthostingdatasourceid"]: { name: "Hosting "+OpenaireEntities.DATASOURCE, type: "entity", @@ -280,7 +280,7 @@ export class SearchFields { filterType: null }, ["projectkeywords"]: { - name: "Keywords", + name: "Keyword", type: "keyword", param: "keywords", operator: "ky", @@ -515,7 +515,7 @@ export class SearchFields { type: "vocabulary", param: "country", operator: "cu", - equalityOperator: "=", + equalityOperator: " exact ", filterType: "checkbox" }, ["datasourcethematic"]: { @@ -531,7 +531,7 @@ export class SearchFields { type: "vocabulary", param: "jurisdiction", operator: "ju", - equalityOperator: "=", + equalityOperator: " exact ", filterType: "checkbox" } }; @@ -561,7 +561,7 @@ export class SearchFields { type: "vocabulary", param: "country", operator: "cu", - equalityOperator: "=", + equalityOperator: " exact ", filterType: "checkbox" }, ["datasourceodsubjects"]: { @@ -622,7 +622,7 @@ export class SearchFields { type: "vocabulary", param: "country", operator: "cu", - equalityOperator: "=", + equalityOperator: " exact ", filterType: "checkbox" }, };