fixed bug where removing a filter in the submission relationship modal redirects to the homepage

This commit is contained in:
lotte
2019-12-20 10:15:24 +01:00
parent d352443848
commit 7c39bf4b5f

View File

@@ -1,9 +1,10 @@
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { Params } from '@angular/router'; import { Params, Router } from '@angular/router';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { hasValue, isNotEmpty } from '../../../empty.util'; import { hasValue, isNotEmpty } from '../../../empty.util';
import { SearchService } from '../../../../core/shared/search/search.service'; import { SearchService } from '../../../../core/shared/search/search.service';
import { currentPath } from '../../../utils/route.utils';
@Component({ @Component({
selector: 'ds-search-label', selector: 'ds-search-label',
@@ -25,7 +26,8 @@ export class SearchLabelComponent implements OnInit {
* Initialize the instance variable * Initialize the instance variable
*/ */
constructor( constructor(
private searchService: SearchService) { private searchService: SearchService,
private router: Router) {
} }
ngOnInit(): void { ngOnInit(): void {
@@ -55,7 +57,7 @@ export class SearchLabelComponent implements OnInit {
*/ */
private getSearchLink(): string { private getSearchLink(): string {
if (this.inPlaceSearch) { if (this.inPlaceSearch) {
return './'; return currentPath(this.router);
} }
return this.searchService.getSearchLink(); return this.searchService.getSearchLink();
} }