From: Chocobozzz Date: Wed, 8 Mar 2017 20:52:25 +0000 (+0100) Subject: Allow to sort by likes X-Git-Tag: v0.0.1-alpha~501 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=86e83939869976e9b4dfa6dc9d3785a284bd598c;hp=d38b82810638b9f664c9016fac2684454c273a77;p=github%2FChocobozzz%2FPeerTube.git Allow to sort by likes --- diff --git a/client/src/app/videos/shared/sort-field.type.ts b/client/src/app/videos/shared/sort-field.type.ts index 7bda3112a..6cc598d8b 100644 --- a/client/src/app/videos/shared/sort-field.type.ts +++ b/client/src/app/videos/shared/sort-field.type.ts @@ -1,3 +1,6 @@ export type SortField = 'name' | '-name' | 'duration' | '-duration' - | 'createdAt' | '-createdAt'; + | 'createdAt' | '-createdAt' + | 'views' | '-views' + | 'likes' | '-likes'; + diff --git a/client/src/app/videos/video-list/video-list.component.ts b/client/src/app/videos/video-list/video-list.component.ts index 844e14567..ede1b51a9 100644 --- a/client/src/app/videos/video-list/video-list.component.ts +++ b/client/src/app/videos/video-list/video-list.component.ts @@ -18,7 +18,6 @@ import { SearchService } from '../../shared'; styleUrls: [ './video-list.component.scss' ], templateUrl: './video-list.component.html' }) - export class VideoListComponent implements OnInit, OnDestroy { loading: BehaviorSubject = new BehaviorSubject(false); pagination: RestPagination = { diff --git a/client/src/app/videos/video-list/video-sort.component.ts b/client/src/app/videos/video-list/video-sort.component.ts index c950fa8aa..cde307f2f 100644 --- a/client/src/app/videos/video-list/video-sort.component.ts +++ b/client/src/app/videos/video-list/video-sort.component.ts @@ -12,7 +12,7 @@ export class VideoSortComponent { @Input() currentSort: SortField; - sortChoices = { + sortChoices: { [ id: SortField ]: string } = { 'name': 'Name - Asc', '-name': 'Name - Desc', 'duration': 'Duration - Asc', @@ -20,7 +20,9 @@ export class VideoSortComponent { 'createdAt': 'Created Date - Asc', '-createdAt': 'Created Date - Desc', 'views': 'Views - Asc', - '-views': 'Views - Desc' + '-views': 'Views - Desc', + 'likes': 'Likes - Asc', + '-likes': 'Likes - Desc' }; get choiceKeys() { diff --git a/server/initializers/constants.js b/server/initializers/constants.js index 16a2dd320..f9247e945 100644 --- a/server/initializers/constants.js +++ b/server/initializers/constants.js @@ -24,7 +24,7 @@ const SEARCHABLE_COLUMNS = { const SORTABLE_COLUMNS = { USERS: [ 'id', 'username', 'createdAt' ], VIDEO_ABUSES: [ 'id', 'createdAt' ], - VIDEOS: [ 'name', 'duration', 'createdAt', 'views' ] + VIDEOS: [ 'name', 'duration', 'createdAt', 'views', 'likes' ] } const OAUTH_LIFETIME = {