diff options
Diffstat (limited to 'client/src/app/shared/video')
-rw-r--r-- | client/src/app/shared/video/abstract-video-list.ts | 4 | ||||
-rw-r--r-- | client/src/app/shared/video/video.service.ts | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index d60536e20..59d3c1ebe 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts | |||
@@ -24,7 +24,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy { | |||
24 | totalItems: null | 24 | totalItems: null |
25 | } | 25 | } |
26 | sort: VideoSortField = '-publishedAt' | 26 | sort: VideoSortField = '-publishedAt' |
27 | category?: number | 27 | categoryOneOf?: number |
28 | defaultSort: VideoSortField = '-publishedAt' | 28 | defaultSort: VideoSortField = '-publishedAt' |
29 | syndicationItems = [] | 29 | syndicationItems = [] |
30 | 30 | ||
@@ -168,7 +168,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy { | |||
168 | 168 | ||
169 | protected loadRouteParams (routeParams: { [ key: string ]: any }) { | 169 | protected loadRouteParams (routeParams: { [ key: string ]: any }) { |
170 | this.sort = routeParams['sort'] as VideoSortField || this.defaultSort | 170 | this.sort = routeParams['sort'] as VideoSortField || this.defaultSort |
171 | this.category = routeParams['category'] | 171 | this.categoryOneOf = routeParams['categoryOneOf'] |
172 | if (routeParams['page'] !== undefined) { | 172 | if (routeParams['page'] !== undefined) { |
173 | this.pagination.currentPage = parseInt(routeParams['page'], 10) | 173 | this.pagination.currentPage = parseInt(routeParams['page'], 10) |
174 | } else { | 174 | } else { |
diff --git a/client/src/app/shared/video/video.service.ts b/client/src/app/shared/video/video.service.ts index f316d31ea..ddf365959 100644 --- a/client/src/app/shared/video/video.service.ts +++ b/client/src/app/shared/video/video.service.ts | |||
@@ -159,7 +159,7 @@ export class VideoService { | |||
159 | videoPagination: ComponentPagination, | 159 | videoPagination: ComponentPagination, |
160 | sort: VideoSortField, | 160 | sort: VideoSortField, |
161 | filter?: VideoFilter, | 161 | filter?: VideoFilter, |
162 | category?: number | 162 | categoryOneOf?: number |
163 | ): Observable<{ videos: Video[], totalVideos: number }> { | 163 | ): Observable<{ videos: Video[], totalVideos: number }> { |
164 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) | 164 | const pagination = this.restService.componentPaginationToRestPagination(videoPagination) |
165 | 165 | ||
@@ -170,8 +170,8 @@ export class VideoService { | |||
170 | params = params.set('filter', filter) | 170 | params = params.set('filter', filter) |
171 | } | 171 | } |
172 | 172 | ||
173 | if (category) { | 173 | if (categoryOneOf) { |
174 | params = params.set('category', category + '') | 174 | params = params.set('categoryOneOf', categoryOneOf + '') |
175 | } | 175 | } |
176 | 176 | ||
177 | return this.authHttp | 177 | return this.authHttp |
@@ -207,12 +207,12 @@ export class VideoService { | |||
207 | return feeds | 207 | return feeds |
208 | } | 208 | } |
209 | 209 | ||
210 | getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, category?: number) { | 210 | getVideoFeedUrls (sort: VideoSortField, filter?: VideoFilter, categoryOneOf?: number) { |
211 | let params = this.restService.addRestGetParams(new HttpParams(), undefined, sort) | 211 | let params = this.restService.addRestGetParams(new HttpParams(), undefined, sort) |
212 | 212 | ||
213 | if (filter) params = params.set('filter', filter) | 213 | if (filter) params = params.set('filter', filter) |
214 | 214 | ||
215 | if (category) params = params.set('category', category + '') | 215 | if (categoryOneOf) params = params.set('categoryOneOf', categoryOneOf + '') |
216 | 216 | ||
217 | return this.buildBaseFeedUrls(params) | 217 | return this.buildBaseFeedUrls(params) |
218 | } | 218 | } |