diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-07 10:07:53 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-08 09:30:31 +0200 |
commit | a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4 (patch) | |
tree | cf2feafcfadb5b6e9784c86d67e692db8d599b7d /client/src/app/+admin | |
parent | 990b6a0b0c4fbebc165e5cf7cec8fbc1cbaa6c66 (diff) | |
download | PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.tar.gz PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.tar.zst PeerTube-a84b8fa5cf6e4cafb841af3db9bdfcc9531c09a4.zip |
Add import.video.torrent configuration
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | 5 | ||||
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 13b43306b..0a032df12 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | |||
@@ -108,6 +108,11 @@ | |||
108 | i18n-labelText labelText="Video import with HTTP enabled" | 108 | i18n-labelText labelText="Video import with HTTP enabled" |
109 | ></my-peertube-checkbox> | 109 | ></my-peertube-checkbox> |
110 | 110 | ||
111 | <my-peertube-checkbox | ||
112 | inputName="importVideosTorrentEnabled" formControlName="importVideosTorrentEnabled" | ||
113 | i18n-labelText labelText="Video import with a torrent file or a magnet URI enabled" | ||
114 | ></my-peertube-checkbox> | ||
115 | |||
111 | <div i18n class="inner-form-title">Administrator</div> | 116 | <div i18n class="inner-form-title">Administrator</div> |
112 | 117 | ||
113 | <div class="form-group"> | 118 | <div class="form-group"> |
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index bc5ce6e5d..fd6784415 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | |||
@@ -72,6 +72,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
72 | signupEnabled: null, | 72 | signupEnabled: null, |
73 | signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT, | 73 | signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT, |
74 | importVideosHttpEnabled: null, | 74 | importVideosHttpEnabled: null, |
75 | importVideosTorrentEnabled: null, | ||
75 | adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL, | 76 | adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL, |
76 | userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, | 77 | userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, |
77 | transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS, | 78 | transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS, |
@@ -189,6 +190,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
189 | videos: { | 190 | videos: { |
190 | http: { | 191 | http: { |
191 | enabled: this.form.value['importVideosHttpEnabled'] | 192 | enabled: this.form.value['importVideosHttpEnabled'] |
193 | }, | ||
194 | torrent: { | ||
195 | enabled: this.form.value['importVideosTorrentEnabled'] | ||
192 | } | 196 | } |
193 | } | 197 | } |
194 | } | 198 | } |
@@ -231,7 +235,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
231 | transcodingEnabled: this.customConfig.transcoding.enabled, | 235 | transcodingEnabled: this.customConfig.transcoding.enabled, |
232 | customizationJavascript: this.customConfig.instance.customizations.javascript, | 236 | customizationJavascript: this.customConfig.instance.customizations.javascript, |
233 | customizationCSS: this.customConfig.instance.customizations.css, | 237 | customizationCSS: this.customConfig.instance.customizations.css, |
234 | importVideosHttpEnabled: this.customConfig.import.videos.http.enabled | 238 | importVideosHttpEnabled: this.customConfig.import.videos.http.enabled, |
239 | importVideosTorrentEnabled: this.customConfig.import.videos.torrent.enabled | ||
235 | } | 240 | } |
236 | 241 | ||
237 | for (const resolution of this.resolutions) { | 242 | for (const resolution of this.resolutions) { |