Merge branch 'master' into w2p-63123_Fix-filterRelationsByTypeLabel

This commit is contained in:
Kristof De Langhe
2019-06-26 11:57:29 +02:00
2 changed files with 1 additions and 5 deletions

View File

@@ -354,10 +354,7 @@ export class SearchService implements OnDestroy {
* @returns {string} The base path to the search page
*/
getSearchLink(): string {
const urlTree = this.router.parseUrl(this.router.url);
const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET];
const searchLink: any = '/' + g.toString();
return (searchLink !== '/search' && searchLink !== '/mydspace') ? '/search' : searchLink;
return '/search';
}
/**

View File

@@ -1,4 +1,3 @@
<script src="../search-switch-configuration/search-switch-configuration.component.ts"></script>
<ng-container *ngVar="(searchOptions$ | async) as config">
<h3>{{ 'search.sidebar.settings.title' | translate}}</h3>
<div *ngIf="config?.sort" class="setting-option result-order-settings mb-3 p-3">