diff options
author | Chocobozzz <me@florianbigard.com> | 2018-08-03 11:10:31 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-06 11:19:16 +0200 |
commit | 5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e (patch) | |
tree | dd992ea798c620b8bdb5bf5fd9b8f1b97d4410f2 /client/src/app/+admin/config | |
parent | 7e5f9f001d5de22c54748f935edc0c069028bb0e (diff) | |
download | PeerTube-5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e.tar.gz PeerTube-5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e.tar.zst PeerTube-5d08a6a74e83f2e4dfe2f3ba7f5a39371e1bc89e.zip |
Add import http enabled configuration
Diffstat (limited to 'client/src/app/+admin/config')
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | 7 | ||||
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | 11 |
2 files changed, 17 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 6e3f83ccf..13b43306b 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 | |||
@@ -101,6 +101,13 @@ | |||
101 | </div> | 101 | </div> |
102 | </div> | 102 | </div> |
103 | 103 | ||
104 | <div i18n class="inner-form-title">Import</div> | ||
105 | |||
106 | <my-peertube-checkbox | ||
107 | inputName="importVideosHttpEnabled" formControlName="importVideosHttpEnabled" | ||
108 | i18n-labelText labelText="Video import with HTTP enabled" | ||
109 | ></my-peertube-checkbox> | ||
110 | |||
104 | <div i18n class="inner-form-title">Administrator</div> | 111 | <div i18n class="inner-form-title">Administrator</div> |
105 | 112 | ||
106 | <div class="form-group"> | 113 | <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 e614c1892..bc5ce6e5d 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 | |||
@@ -71,6 +71,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
71 | cacheCaptionsSize: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE, | 71 | cacheCaptionsSize: this.customConfigValidatorsService.CACHE_CAPTIONS_SIZE, |
72 | signupEnabled: null, | 72 | signupEnabled: null, |
73 | signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT, | 73 | signupLimit: this.customConfigValidatorsService.SIGNUP_LIMIT, |
74 | importVideosHttpEnabled: null, | ||
74 | adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL, | 75 | adminEmail: this.customConfigValidatorsService.ADMIN_EMAIL, |
75 | userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, | 76 | userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, |
76 | transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS, | 77 | transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS, |
@@ -183,6 +184,13 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
183 | '720p': this.form.value[this.getResolutionKey('720p')], | 184 | '720p': this.form.value[this.getResolutionKey('720p')], |
184 | '1080p': this.form.value[this.getResolutionKey('1080p')] | 185 | '1080p': this.form.value[this.getResolutionKey('1080p')] |
185 | } | 186 | } |
187 | }, | ||
188 | import: { | ||
189 | videos: { | ||
190 | http: { | ||
191 | enabled: this.form.value['importVideosHttpEnabled'] | ||
192 | } | ||
193 | } | ||
186 | } | 194 | } |
187 | } | 195 | } |
188 | 196 | ||
@@ -222,7 +230,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
222 | transcodingThreads: this.customConfig.transcoding.threads, | 230 | transcodingThreads: this.customConfig.transcoding.threads, |
223 | transcodingEnabled: this.customConfig.transcoding.enabled, | 231 | transcodingEnabled: this.customConfig.transcoding.enabled, |
224 | customizationJavascript: this.customConfig.instance.customizations.javascript, | 232 | customizationJavascript: this.customConfig.instance.customizations.javascript, |
225 | customizationCSS: this.customConfig.instance.customizations.css | 233 | customizationCSS: this.customConfig.instance.customizations.css, |
234 | importVideosHttpEnabled: this.customConfig.import.videos.http.enabled | ||
226 | } | 235 | } |
227 | 236 | ||
228 | for (const resolution of this.resolutions) { | 237 | for (const resolution of this.resolutions) { |