From b2977eecb8eb5d599df0c6a7ab99a437a6a969c7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 3 Aug 2018 17:00:19 +0200 Subject: Fix fps federation --- client/src/app/+my-account/my-account.component.ts | 2 +- client/src/app/core/server/server.service.ts | 2 +- client/src/app/videos/+video-edit/video-add.component.ts | 2 +- client/src/app/videos/+video-edit/video-import.component.ts | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'client') 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 { ) {} isVideoImportEnabled () { - return this.serverService.getConfig().import.video.http.enabled + return this.serverService.getConfig().import.videos.http.enabled } } 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 { videoQuota: -1 }, import: { - video: { + videos: { http: { enabled: false } 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 { } isVideoImportEnabled () { - return this.serverService.getConfig().import.video.http.enabled + return this.serverService.getConfig().import.videos.http.enabled } } 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 this.loadingBar.complete() this.notificationsService.success(this.i18n('Success'), this.i18n('Video to import updated.')) - // TODO: route to imports list - // this.router.navigate([ '/videos/watch', this.video.uuid ]) + this.router.navigate([ '/my-account', 'video-imports' ]) }, err => { -- cgit v1.2.3