From 5b5e333f068c7bd5fcf519bcd3f687eb46221883 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 27 Mar 2018 17:10:56 +0200 Subject: [PATCH] Fix videos list params --- client/src/app/shared/video/abstract-video-list.ts | 4 ++-- client/src/app/videos/video-list/video-search.component.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index c18ebcf54..90a88544a 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts @@ -54,7 +54,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy { ngOnInit () { // Subscribe to route changes - const routeParams = this.route.snapshot.params + const routeParams = this.route.snapshot.queryParams this.loadRouteParams(routeParams) this.resizeSubscription = fromEvent(window, 'resize') @@ -162,7 +162,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy { protected setNewRouteParams () { const routeParams = this.buildRouteParams() - this.router.navigate([ this.currentRoute, routeParams ]) + this.router.navigate([ this.currentRoute ], { queryParams: routeParams }) } protected buildVideoPages () { diff --git a/client/src/app/videos/video-list/video-search.component.ts b/client/src/app/videos/video-list/video-search.component.ts index 67857a0a9..b94be8e11 100644 --- a/client/src/app/videos/video-list/video-search.component.ts +++ b/client/src/app/videos/video-list/video-search.component.ts @@ -39,6 +39,7 @@ export class VideoSearchComponent extends AbstractVideoList implements OnInit, O this.subActivatedRoute = this.route.queryParams.subscribe( queryParams => { const querySearch = queryParams['search'] + if (!querySearch) return this.redirectService.redirectToHomepage() if (this.otherRouteParams.search === querySearch) return