aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+video-channels
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+video-channels')
-rw-r--r--client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts9
-rw-r--r--client/src/app/+video-channels/video-channels-routing.module.ts4
2 files changed, 7 insertions, 6 deletions
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
index dea378a6e..8af31000e 100644
--- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
+++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
@@ -1,6 +1,5 @@
1import { Component, OnDestroy, OnInit } from '@angular/core' 1import { Component, OnDestroy, OnInit } from '@angular/core'
2import { ActivatedRoute, Router } from '@angular/router' 2import { ActivatedRoute, Router } from '@angular/router'
3import { Location } from '@angular/common'
4import { immutableAssign } from '@app/shared/misc/utils' 3import { immutableAssign } from '@app/shared/misc/utils'
5import { AuthService } from '../../core/auth' 4import { AuthService } from '../../core/auth'
6import { ConfirmService } from '../../core/confirm' 5import { ConfirmService } from '../../core/confirm'
@@ -12,7 +11,7 @@ import { tap } from 'rxjs/operators'
12import { I18n } from '@ngx-translate/i18n-polyfill' 11import { I18n } from '@ngx-translate/i18n-polyfill'
13import { Subscription } from 'rxjs' 12import { Subscription } from 'rxjs'
14import { ScreenService } from '@app/shared/misc/screen.service' 13import { ScreenService } from '@app/shared/misc/screen.service'
15import { Notifier } from '@app/core' 14import { Notifier, ServerService } from '@app/core'
16 15
17@Component({ 16@Component({
18 selector: 'my-video-channel-videos', 17 selector: 'my-video-channel-videos',
@@ -25,7 +24,6 @@ import { Notifier } from '@app/core'
25export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { 24export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
26 titlePage: string 25 titlePage: string
27 marginContent = false // Disable margin 26 marginContent = false // Disable margin
28 currentRoute = '/video-channels/videos'
29 loadOnInit = false 27 loadOnInit = false
30 28
31 private videoChannel: VideoChannel 29 private videoChannel: VideoChannel
@@ -33,13 +31,13 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On
33 31
34 constructor ( 32 constructor (
35 protected router: Router, 33 protected router: Router,
34 protected serverService: ServerService,
36 protected route: ActivatedRoute, 35 protected route: ActivatedRoute,
37 protected authService: AuthService, 36 protected authService: AuthService,
38 protected notifier: Notifier, 37 protected notifier: Notifier,
39 protected confirmService: ConfirmService, 38 protected confirmService: ConfirmService,
40 protected location: Location,
41 protected screenService: ScreenService, 39 protected screenService: ScreenService,
42 protected i18n: I18n, 40 private i18n: I18n,
43 private videoChannelService: VideoChannelService, 41 private videoChannelService: VideoChannelService,
44 private videoService: VideoService 42 private videoService: VideoService
45 ) { 43 ) {
@@ -55,7 +53,6 @@ export class VideoChannelVideosComponent extends AbstractVideoList implements On
55 this.videoChannelSub = this.videoChannelService.videoChannelLoaded 53 this.videoChannelSub = this.videoChannelService.videoChannelLoaded
56 .subscribe(videoChannel => { 54 .subscribe(videoChannel => {
57 this.videoChannel = videoChannel 55 this.videoChannel = videoChannel
58 this.currentRoute = '/video-channels/' + this.videoChannel.nameWithHost + '/videos'
59 56
60 this.reloadVideos() 57 this.reloadVideos()
61 this.generateSyndicationList() 58 this.generateSyndicationList()
diff --git a/client/src/app/+video-channels/video-channels-routing.module.ts b/client/src/app/+video-channels/video-channels-routing.module.ts
index cedd07d39..d4872a0a5 100644
--- a/client/src/app/+video-channels/video-channels-routing.module.ts
+++ b/client/src/app/+video-channels/video-channels-routing.module.ts
@@ -23,6 +23,10 @@ const videoChannelsRoutes: Routes = [
23 data: { 23 data: {
24 meta: { 24 meta: {
25 title: 'Video channel videos' 25 title: 'Video channel videos'
26 },
27 reuse: {
28 enabled: true,
29 key: 'video-channel-videos-list'
26 } 30 }
27 } 31 }
28 }, 32 },