X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-edit%2Fvideo-add-components%2Fvideo-send.ts;h=b32f16950908a8f05f72557b38336ef0f3bd7622;hb=ba430d7516bc5b1324b60571ba7594460969b7fb;hp=580c123a029a59cc10a857545a441b9c60cdc28c;hpb=5dfb7c1dec8222b0bbccac5b56ad46da1438747e;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/videos/+video-edit/video-add-components/video-send.ts b/client/src/app/videos/+video-edit/video-add-components/video-send.ts index 580c123a0..b32f16950 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-send.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-send.ts @@ -3,7 +3,7 @@ import { LoadingBarService } from '@ngx-loading-bar/core' import { AuthService, Notifier, ServerService } from '@app/core' import { catchError, switchMap, tap } from 'rxjs/operators' import { FormReactive } from '@app/shared' -import { VideoConstant, VideoPrivacy } from '../../../../../../shared' +import { ServerConfig, VideoConstant, VideoPrivacy } from '../../../../../../shared' import { VideoService } from '@app/shared/video/video.service' import { VideoCaptionEdit } from '@app/shared/video-caption/video-caption-edit.model' import { VideoCaptionService } from '@app/shared/video-caption' @@ -29,6 +29,7 @@ export abstract class VideoSend extends FormReactive implements OnInit { protected serverService: ServerService protected videoService: VideoService protected videoCaptionService: VideoCaptionService + protected serverConfig: ServerConfig abstract canDeactivate (): CanComponentDeactivateResult @@ -38,10 +39,14 @@ export abstract class VideoSend extends FormReactive implements OnInit { populateAsyncUserVideoChannels(this.authService, this.userVideoChannels) .then(() => this.firstStepChannelId = this.userVideoChannels[ 0 ].id) - this.serverService.videoPrivaciesLoaded + this.serverConfig = this.serverService.getTmpConfig() + this.serverService.getConfig() + .subscribe(config => this.serverConfig = config) + + this.serverService.getVideoPrivacies() .subscribe( - () => { - this.videoPrivacies = this.serverService.getVideoPrivacies() + privacies => { + this.videoPrivacies = privacies this.firstStepPrivacyId = this.DEFAULT_VIDEO_PRIVACY })