aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-08-03 17:00:19 +0200
committerChocobozzz <me@florianbigard.com>2018-08-06 11:19:16 +0200
commitb2977eecb8eb5d599df0c6a7ab99a437a6a969c7 (patch)
treeee5f59a932f4395a2e4148e84cdde02cdc32e26f /client/src/app
parent590fb5069038e69898123bb795f789683216d837 (diff)
downloadPeerTube-b2977eecb8eb5d599df0c6a7ab99a437a6a969c7.tar.gz
PeerTube-b2977eecb8eb5d599df0c6a7ab99a437a6a969c7.tar.zst
PeerTube-b2977eecb8eb5d599df0c6a7ab99a437a6a969c7.zip
Fix fps federation
Diffstat (limited to 'client/src/app')
-rw-r--r--client/src/app/+my-account/my-account.component.ts2
-rw-r--r--client/src/app/core/server/server.service.ts2
-rw-r--r--client/src/app/videos/+video-edit/video-add.component.ts2
-rw-r--r--client/src/app/videos/+video-edit/video-import.component.ts3
4 files changed, 4 insertions, 5 deletions
diff --git a/client/src/app/+my-account/my-account.component.ts b/client/src/app/+my-account/my-account.component.ts
index a8f5f8f31..6e29cdd83 100644
--- a/client/src/app/+my-account/my-account.component.ts
+++ b/client/src/app/+my-account/my-account.component.ts
@@ -12,6 +12,6 @@ export class MyAccountComponent {
12 ) {} 12 ) {}
13 13
14 isVideoImportEnabled () { 14 isVideoImportEnabled () {
15 return this.serverService.getConfig().import.video.http.enabled 15 return this.serverService.getConfig().import.videos.http.enabled
16 } 16 }
17} 17}
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts
index e2254b7b5..ab317f0aa 100644
--- a/client/src/app/core/server/server.service.ts
+++ b/client/src/app/core/server/server.service.ts
@@ -70,7 +70,7 @@ export class ServerService {
70 videoQuota: -1 70 videoQuota: -1
71 }, 71 },
72 import: { 72 import: {
73 video: { 73 videos: {
74 http: { 74 http: {
75 enabled: false 75 enabled: false
76 } 76 }
diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts
index d38a53db9..69b364ddd 100644
--- a/client/src/app/videos/+video-edit/video-add.component.ts
+++ b/client/src/app/videos/+video-edit/video-add.component.ts
@@ -33,6 +33,6 @@ export class VideoAddComponent implements CanComponentDeactivate {
33 } 33 }
34 34
35 isVideoImportEnabled () { 35 isVideoImportEnabled () {
36 return this.serverService.getConfig().import.video.http.enabled 36 return this.serverService.getConfig().import.videos.http.enabled
37 } 37 }
38} 38}
diff --git a/client/src/app/videos/+video-edit/video-import.component.ts b/client/src/app/videos/+video-edit/video-import.component.ts
index b1e8e0205..5f14efd54 100644
--- a/client/src/app/videos/+video-edit/video-import.component.ts
+++ b/client/src/app/videos/+video-edit/video-import.component.ts
@@ -145,8 +145,7 @@ export class VideoImportComponent extends FormReactive implements OnInit, CanCom
145 this.loadingBar.complete() 145 this.loadingBar.complete()
146 this.notificationsService.success(this.i18n('Success'), this.i18n('Video to import updated.')) 146 this.notificationsService.success(this.i18n('Success'), this.i18n('Video to import updated.'))
147 147
148 // TODO: route to imports list 148 this.router.navigate([ '/my-account', 'video-imports' ])
149 // this.router.navigate([ '/videos/watch', this.video.uuid ])
150 }, 149 },
151 150
152 err => { 151 err => {