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

Don't throw an error on empty search

pull/1162/head
Chocobozzz 2018-10-01 17:39:09 +02:00
parent c2ad546df9
commit 4787966900
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/src/app/search/search.component.ts
View File

@ -51,15 +51,12 @@ export class SearchComponent implements OnInit, OnDestroy {
queryParams => { queryParams => {
const querySearch = queryParams['search'] const querySearch = queryParams['search']
// New empty search
if (this.currentSearch && !querySearch) return this.redirectService.redirectToHomepage()
// Search updated, reset filters // Search updated, reset filters
if (this.currentSearch !== querySearch) { if (this.currentSearch !== querySearch) {
this.resetPagination() this.resetPagination()
this.advancedSearch.reset() this.advancedSearch.reset()
this.currentSearch = querySearch this.currentSearch = querySearch || undefined
this.updateTitle() this.updateTitle()
} }
@ -154,7 +151,7 @@ export class SearchComponent implements OnInit, OnDestroy {
} }
private updateUrlFromAdvancedSearch () { private updateUrlFromAdvancedSearch () {
const search = (this.currentSearch && this.currentSearch !== '') ? this.currentSearch : undefined const search = this.currentSearch || undefined
this.router.navigate([], { this.router.navigate([], {
relativeTo: this.route, relativeTo: this.route,