aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+admin
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+admin')
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html24
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts26
-rw-r--r--client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts3
-rw-r--r--client/src/app/+admin/system/jobs/jobs.component.ts3
4 files changed, 50 insertions, 6 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
index 7dfe5f5f9..929ea3a90 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.html
@@ -267,10 +267,10 @@
267 inputName="importVideosHttpEnabled" formControlName="enabled" 267 inputName="importVideosHttpEnabled" formControlName="enabled"
268 i18n-labelText labelText="Allow import with HTTP URL (e.g. YouTube)" 268 i18n-labelText labelText="Allow import with HTTP URL (e.g. YouTube)"
269 > 269 >
270 <ng-container ngProjectAs="description"> 270 <ng-container ngProjectAs="description">
271 <span i18n>⚠️ If enabled, we recommend to use <a class="link-orange" href="https://docs.joinpeertube.org/maintain-configuration?id=security">a HTTP proxy</a> to prevent private URL access from your PeerTube server</span> 271 <span i18n>⚠️ If enabled, we recommend to use <a class="link-orange" href="https://docs.joinpeertube.org/maintain-configuration?id=security">a HTTP proxy</a> to prevent private URL access from your PeerTube server</span>
272 </ng-container> 272 </ng-container>
273 </my-peertube-checkbox> 273 </my-peertube-checkbox>
274 </div> 274 </div>
275 275
276 <div class="form-group" formGroupName="torrent"> 276 <div class="form-group" formGroupName="torrent">
@@ -285,6 +285,22 @@
285 </div> 285 </div>
286 286
287 </ng-container> 287 </ng-container>
288
289 <ng-container formGroupName="videoChannelSynchronization">
290 <div class="form-group">
291 <my-peertube-checkbox
292 inputName="importSynchronizationEnabled" formControlName="enabled"
293 i18n-labelText labelText="Allow channel synchronization with channel of other platforms like YouTube (requires allowing import with HTTP URL)"
294 >
295 <ng-container ngProjectAs="description">
296 <span i18n [hidden]="isImportVideosHttpEnabled()">
297 ⛔ You need to allow import with HTTP URL to be able to activate this feature.
298 </span>
299 </ng-container>
300 </my-peertube-checkbox>
301 </div>
302 </ng-container>
303
288 </ng-container> 304 </ng-container>
289 305
290 <ng-container formGroupName="autoBlacklist"> 306 <ng-container formGroupName="autoBlacklist">
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts
index 29910369a..90ed58c99 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-basic-configuration.component.ts
@@ -25,11 +25,12 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges {
25 private configService: ConfigService, 25 private configService: ConfigService,
26 private menuService: MenuService, 26 private menuService: MenuService,
27 private themeService: ThemeService 27 private themeService: ThemeService
28 ) { } 28 ) {}
29 29
30 ngOnInit () { 30 ngOnInit () {
31 this.buildLandingPageOptions() 31 this.buildLandingPageOptions()
32 this.checkSignupField() 32 this.checkSignupField()
33 this.checkImportSyncField()
33 34
34 this.availableThemes = this.themeService.buildAvailableThemes() 35 this.availableThemes = this.themeService.buildAvailableThemes()
35 } 36 }
@@ -67,6 +68,14 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges {
67 return { 'disabled-checkbox-extra': !this.isSignupEnabled() } 68 return { 'disabled-checkbox-extra': !this.isSignupEnabled() }
68 } 69 }
69 70
71 isImportVideosHttpEnabled (): boolean {
72 return this.form.value['import']['videos']['http']['enabled'] === true
73 }
74
75 importSynchronizationChecked () {
76 return this.isImportVideosHttpEnabled() && this.form.value['import']['videoChannelSynchronization']['enabled']
77 }
78
70 hasUnlimitedSignup () { 79 hasUnlimitedSignup () {
71 return this.form.value['signup']['limit'] === -1 80 return this.form.value['signup']['limit'] === -1
72 } 81 }
@@ -97,6 +106,21 @@ export class EditBasicConfigurationComponent implements OnInit, OnChanges {
97 return this.themeService.getDefaultThemeLabel() 106 return this.themeService.getDefaultThemeLabel()
98 } 107 }
99 108
109 private checkImportSyncField () {
110 const importSyncControl = this.form.get('import.videoChannelSynchronization.enabled')
111 const importVideosHttpControl = this.form.get('import.videos.http.enabled')
112
113 importVideosHttpControl.valueChanges
114 .subscribe((httpImportEnabled) => {
115 importSyncControl.setValue(httpImportEnabled && importSyncControl.value)
116 if (httpImportEnabled) {
117 importSyncControl.enable()
118 } else {
119 importSyncControl.disable()
120 }
121 })
122 }
123
100 private checkSignupField () { 124 private checkSignupField () {
101 const signupControl = this.form.get('signup.enabled') 125 const signupControl = this.form.get('signup.enabled')
102 126
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 ce01f8b59..5cab9e9df 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
@@ -144,6 +144,9 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
144 torrent: { 144 torrent: {
145 enabled: null 145 enabled: null
146 } 146 }
147 },
148 videoChannelSynchronization: {
149 enabled: null
147 } 150 }
148 }, 151 },
149 trending: { 152 trending: {
diff --git a/client/src/app/+admin/system/jobs/jobs.component.ts b/client/src/app/+admin/system/jobs/jobs.component.ts
index 42f503be6..4cda63272 100644
--- a/client/src/app/+admin/system/jobs/jobs.component.ts
+++ b/client/src/app/+admin/system/jobs/jobs.component.ts
@@ -38,7 +38,8 @@ export class JobsComponent extends RestTable implements OnInit {
38 'video-redundancy', 38 'video-redundancy',
39 'video-transcoding', 39 'video-transcoding',
40 'videos-views-stats', 40 'videos-views-stats',
41 'move-to-object-storage' 41 'move-to-object-storage',
42 'video-channel-import'
42 ] 43 ]
43 44
44 jobs: Job[] = [] 45 jobs: Job[] = []