From 263ac45f1fc08e90300cdf6cf3a1d7aee90197ea Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Wed, 18 Jan 2017 10:44:19 +0000 Subject: [PATCH] bug fixes: search/find error | create proper search parameters git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@45443 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../src/app/searchPages/searchUtils/searchPage.component.ts | 6 +++--- portal-2/src/server.routes.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts index 675ed608..9140149f 100644 --- a/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts +++ b/portal-2/src/app/searchPages/searchUtils/searchPage.component.ts @@ -243,14 +243,14 @@ export class SearchPageComponent { } } this.queryParameters[filter.filterId]=filterLimits; - allLimits+=((filterLimits.length == 0 )?'':"&" +filter.filterId + '='+ filterLimits) ; + allLimits+=(allLimits.length==0?"?":"&")+((filterLimits.length == 0 )?'':filter.filterId + '='+ filterLimits) ; } } if(this.searchUtils.keyword.length > 0 ){ - allLimits+='&keyword=' + this.searchUtils.keyword; + allLimits+=(allLimits.length==0?"?":"&")+'keyword=' + this.searchUtils.keyword; } if(this.searchUtils.page != 1 && includePage){ - allLimits+=((allLimits.length == 0)?'':'&') + 'page=' + this.searchUtils.page; + allLimits+=((allLimits.length == 0)?'?':'&') + 'page=' + this.searchUtils.page; } return allLimits; } diff --git a/portal-2/src/server.routes.ts b/portal-2/src/server.routes.ts index 66db442c..980ec0d3 100644 --- a/portal-2/src/server.routes.ts +++ b/portal-2/src/server.routes.ts @@ -10,7 +10,7 @@ * ]; **/ export const routes: string[] = [ - 'claims','claim','myclaims','linking','bulk-linking', + 'claims','claim','myclaims','linking','bulk-linking','search/find', 'search/person','search/publication','search/project','search/dataset','search/dataprovider','search/organization', 'search/find/people','search/find/publications','search/find/projects','search/find/datasets','search/find/dataproviders','search/find/organizations', 'search/advanced/people','search/advanced/publications','search/advanced/projects','search/advanced/datasets','search/advanced/dataproviders','search/advanced/organizations',