diff options
Diffstat (limited to 'client/src/app/videos/+video-edit/shared')
3 files changed, 22 insertions, 11 deletions
diff --git a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts index 86c6e03e7..1a9bf5171 100644 --- a/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts +++ b/client/src/app/videos/+video-edit/shared/video-caption-add-modal.component.ts | |||
@@ -5,7 +5,7 @@ import { VideoCaptionsValidatorsService } from '@app/shared/forms/form-validator | |||
5 | import { ServerService } from '@app/core' | 5 | import { ServerService } from '@app/core' |
6 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' | 6 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' |
7 | import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' | 7 | import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' |
8 | import { VideoConstant } from '../../../../../../shared' | 8 | import { ServerConfig, VideoConstant } from '../../../../../../shared' |
9 | 9 | ||
10 | @Component({ | 10 | @Component({ |
11 | selector: 'my-video-caption-add-modal', | 11 | selector: 'my-video-caption-add-modal', |
@@ -15,6 +15,7 @@ import { VideoConstant } from '../../../../../../shared' | |||
15 | 15 | ||
16 | export class VideoCaptionAddModalComponent extends FormReactive implements OnInit { | 16 | export class VideoCaptionAddModalComponent extends FormReactive implements OnInit { |
17 | @Input() existingCaptions: string[] | 17 | @Input() existingCaptions: string[] |
18 | @Input() serverConfig: ServerConfig | ||
18 | 19 | ||
19 | @Output() captionAdded = new EventEmitter<VideoCaptionEdit>() | 20 | @Output() captionAdded = new EventEmitter<VideoCaptionEdit>() |
20 | 21 | ||
@@ -35,15 +36,16 @@ export class VideoCaptionAddModalComponent extends FormReactive implements OnIni | |||
35 | } | 36 | } |
36 | 37 | ||
37 | get videoCaptionExtensions () { | 38 | get videoCaptionExtensions () { |
38 | return this.serverService.getConfig().videoCaption.file.extensions | 39 | return this.serverConfig.videoCaption.file.extensions |
39 | } | 40 | } |
40 | 41 | ||
41 | get videoCaptionMaxSize () { | 42 | get videoCaptionMaxSize () { |
42 | return this.serverService.getConfig().videoCaption.file.size.max | 43 | return this.serverConfig.videoCaption.file.size.max |
43 | } | 44 | } |
44 | 45 | ||
45 | ngOnInit () { | 46 | ngOnInit () { |
46 | this.videoCaptionLanguages = this.serverService.getVideoLanguages() | 47 | this.serverService.getVideoLanguages() |
48 | .subscribe(languages => this.videoCaptionLanguages = languages) | ||
47 | 49 | ||
48 | this.buildForm({ | 50 | this.buildForm({ |
49 | language: this.videoCaptionsValidatorsService.VIDEO_CAPTION_LANGUAGE, | 51 | language: this.videoCaptionsValidatorsService.VIDEO_CAPTION_LANGUAGE, |
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html index e2a222037..e40649d95 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.html +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html | |||
@@ -269,5 +269,5 @@ | |||
269 | </div> | 269 | </div> |
270 | 270 | ||
271 | <my-video-caption-add-modal | 271 | <my-video-caption-add-modal |
272 | #videoCaptionAddModal [existingCaptions]="existingCaptions" (captionAdded)="onCaptionAdded($event)" | 272 | #videoCaptionAddModal [existingCaptions]="existingCaptions" [serverConfig]="serverConfig" (captionAdded)="onCaptionAdded($event)" |
273 | ></my-video-caption-add-modal> | 273 | ></my-video-caption-add-modal> |
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.ts b/client/src/app/videos/+video-edit/shared/video-edit.component.ts index d0d5e2a2b..982e071ad 100644 --- a/client/src/app/videos/+video-edit/shared/video-edit.component.ts +++ b/client/src/app/videos/+video-edit/shared/video-edit.component.ts | |||
@@ -12,7 +12,7 @@ import { VideoCaptionService } from '@app/shared/video-caption' | |||
12 | import { VideoCaptionAddModalComponent } from '@app/videos/+video-edit/shared/video-caption-add-modal.component' | 12 | import { VideoCaptionAddModalComponent } from '@app/videos/+video-edit/shared/video-caption-add-modal.component' |
13 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' | 13 | import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' |
14 | import { removeElementFromArray } from '@app/shared/misc/utils' | 14 | import { removeElementFromArray } from '@app/shared/misc/utils' |
15 | import { VideoConstant, VideoPrivacy } from '../../../../../../shared' | 15 | import { ServerConfig, VideoConstant, VideoPrivacy } from '../../../../../../shared' |
16 | import { VideoService } from '@app/shared/video/video.service' | 16 | import { VideoService } from '@app/shared/video/video.service' |
17 | 17 | ||
18 | @Component({ | 18 | @Component({ |
@@ -51,6 +51,8 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
51 | calendarTimezone: string | 51 | calendarTimezone: string |
52 | calendarDateFormat: string | 52 | calendarDateFormat: string |
53 | 53 | ||
54 | serverConfig: ServerConfig | ||
55 | |||
54 | private schedulerInterval: any | 56 | private schedulerInterval: any |
55 | private firstPatchDone = false | 57 | private firstPatchDone = false |
56 | private initialVideoCaptions: string[] = [] | 58 | private initialVideoCaptions: string[] = [] |
@@ -130,12 +132,19 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
130 | ngOnInit () { | 132 | ngOnInit () { |
131 | this.updateForm() | 133 | this.updateForm() |
132 | 134 | ||
133 | this.videoCategories = this.serverService.getVideoCategories() | 135 | this.serverService.getVideoCategories() |
134 | this.videoLicences = this.serverService.getVideoLicences() | 136 | .subscribe(res => this.videoCategories = res) |
135 | this.videoLanguages = this.serverService.getVideoLanguages() | 137 | this.serverService.getVideoLicences() |
138 | .subscribe(res => this.videoLicences = res) | ||
139 | this.serverService.getVideoLanguages() | ||
140 | .subscribe(res => this.videoLanguages = res) | ||
141 | |||
142 | this.serverService.getVideoPrivacies() | ||
143 | .subscribe(privacies => this.videoPrivacies = this.videoService.explainedPrivacyLabels(privacies)) | ||
136 | 144 | ||
137 | const privacies = this.serverService.getVideoPrivacies() | 145 | this.serverConfig = this.serverService.getTmpConfig() |
138 | this.videoPrivacies = this.videoService.explainedPrivacyLabels(privacies) | 146 | this.serverService.getConfig() |
147 | .subscribe(config => this.serverConfig = config) | ||
139 | 148 | ||
140 | this.initialVideoCaptions = this.videoCaptions.map(c => c.language.id) | 149 | this.initialVideoCaptions = this.videoCaptions.map(c => c.language.id) |
141 | 150 | ||