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

category parma -> categoryOneOf (videos list)

pull/850/head
Chocobozzz 2018-07-25 17:18:46 +02:00
parent 87bec1051b
commit d59cba295b
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 13 additions and 13 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

@ -24,7 +24,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
totalItems: null
}
sort: VideoSortField = '-publishedAt'
category?: number
categoryOneOf?: number
defaultSort: VideoSortField = '-publishedAt'
syndicationItems = []
@ -168,7 +168,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy {
protected loadRouteParams (routeParams: { [ key: string ]: any }) {
this.sort = routeParams['sort'] as VideoSortField || this.defaultSort
this.category = routeParams['category']
this.categoryOneOf = routeParams['categoryOneOf']
if (routeParams['page'] !== undefined) {
this.pagination.currentPage = parseInt(routeParams['page'], 10)
} else {

10
client/src/app/shared/video/video.service.ts
View File

@ -159,7 +159,7 @@ export class VideoService {
videoPagination: ComponentPagination,
sort: VideoSortField,
filter?: VideoFilter,
category?: number
categoryOneOf?: number
): Observable<{ videos: Video[], totalVideos: number }> {
const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
@ -170,8 +170,8 @@ export class VideoService {
params = params.set('filter', filter)
}
if (category) {
params = params.set('category', category + '')
if (categoryOneOf) {
params = params.set('categoryOneOf', categoryOneOf + '')
}
return this.authHttp
@ -207,12 +207,12 @@ export class VideoService {
return feeds
}
getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, category?: number) {
getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, categoryOneOf?: number) {
let params = this.restService.addRestGetParams(new HttpParams(), undefined, sort)
if (filter) params = params.set('filter', filter)
if (category) params = params.set('category', category + '')
if (categoryOneOf) params = params.set('categoryOneOf', categoryOneOf + '')
return this.buildBaseFeedUrls(params)
}

4
client/src/app/videos/video-list/video-local.component.ts
View File

@ -50,10 +50,10 @@ export class VideoLocalComponent extends AbstractVideoList implements OnInit, On
getVideosObservable (page: number) {
const newPagination = immutableAssign(this.pagination, { currentPage: page })
return this.videoService.getVideos(newPagination, this.sort, this.filter, this.category)
return this.videoService.getVideos(newPagination, this.sort, this.filter, this.categoryOneOf)
}
generateSyndicationList () {
this.syndicationItems = this.videoService.getVideoFeedUrls(this.sort, this.filter, this.category)
this.syndicationItems = this.videoService.getVideoFeedUrls(this.sort, this.filter, this.categoryOneOf)
}
}

4
client/src/app/videos/video-list/video-recently-added.component.ts
View File

@ -48,10 +48,10 @@ export class VideoRecentlyAddedComponent extends AbstractVideoList implements On
getVideosObservable (page: number) {
const newPagination = immutableAssign(this.pagination, { currentPage: page })
return this.videoService.getVideos(newPagination, this.sort, undefined, this.category)
return this.videoService.getVideos(newPagination, this.sort, undefined, this.categoryOneOf)
}
generateSyndicationList () {
this.syndicationItems = this.videoService.getVideoFeedUrls(this.sort, undefined, this.category)
this.syndicationItems = this.videoService.getVideoFeedUrls(this.sort, undefined, this.categoryOneOf)
}
}

4
client/src/app/videos/video-list/video-trending.component.ts
View File

@ -47,10 +47,10 @@ export class VideoTrendingComponent extends AbstractVideoList implements OnInit,
getVideosObservable (page: number) {
const newPagination = immutableAssign(this.pagination, { currentPage: page })
return this.videoService.getVideos(newPagination, this.sort, undefined, this.category)
return this.videoService.getVideos(newPagination, this.sort, undefined, this.categoryOneOf)
}
generateSyndicationList () {
this.syndicationItems = this.videoService.getVideoFeedUrls(this.sort, undefined, this.category)
this.syndicationItems = this.videoService.getVideoFeedUrls(this.sort, undefined, this.categoryOneOf)
}
}