OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix videos list params

pull/425/head
Chocobozzz 2018-03-27 17:10:56 +02:00
parent d414207f07
commit 5b5e333f06
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/app/shared/video/abstract-video-list.ts
View File

@ -54,7 +54,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
ngOnInit () { ngOnInit () {
// Subscribe to route changes // Subscribe to route changes
const routeParams = this.route.snapshot.params const routeParams = this.route.snapshot.queryParams
this.loadRouteParams(routeParams) this.loadRouteParams(routeParams)
this.resizeSubscription = fromEvent(window, 'resize') this.resizeSubscription = fromEvent(window, 'resize')
@ -162,7 +162,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
protected setNewRouteParams () { protected setNewRouteParams () {
const routeParams = this.buildRouteParams() const routeParams = this.buildRouteParams()
this.router.navigate([ this.currentRoute, routeParams ]) this.router.navigate([ this.currentRoute ], { queryParams: routeParams })
} }
protected buildVideoPages () { protected buildVideoPages () {

1
client/src/app/videos/video-list/video-search.component.ts
View File

@ -39,6 +39,7 @@ export class VideoSearchComponent extends AbstractVideoList implements OnInit, O
this.subActivatedRoute = this.route.queryParams.subscribe( this.subActivatedRoute = this.route.queryParams.subscribe(
queryParams => { queryParams => {
const querySearch = queryParams['search'] const querySearch = queryParams['search']
if (!querySearch) return this.redirectService.redirectToHomepage() if (!querySearch) return this.redirectService.redirectToHomepage()
if (this.otherRouteParams.search === querySearch) return if (this.otherRouteParams.search === querySearch) return