X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fvideos%2F%2Bvideo-edit%2Fshared%2Fvideo-edit.component.ts;h=7fe2652843bc400e450a2b7966a9bc11c8f61b4d;hb=5f0805d39b94eb2de1b73e0f43ac8685ae900994;hp=5b1cc3f9ca3b678ba6530fb1f35582741e4e15b7;hpb=fada8d75550dc7365f7e18ee1569b9406251d660;p=github%2FChocobozzz%2FPeerTube.git 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 5b1cc3f9c..7fe265284 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 @@ -2,12 +2,11 @@ import { Component, Input, OnInit } from '@angular/core' import { FormBuilder, FormControl, FormGroup } from '@angular/forms' import { ActivatedRoute, Router } from '@angular/router' import { NotificationsService } from 'angular2-notifications' -import { ServerService } from 'app/core' -import { VideoEdit } from 'app/shared/video/video-edit.model' import 'rxjs/add/observable/forkJoin' -import { VideoPrivacy } from '../../../../../shared/models/videos/video-privacy.enum' +import { ServerService } from '../../../core/server' +import { VIDEO_CHANNEL } from '../../../shared/forms/form-validators' +import { ValidatorMessage } from '../../../shared/forms/form-validators/validator-message' import { - ValidatorMessage, VIDEO_CATEGORY, VIDEO_DESCRIPTION, VIDEO_LANGUAGE, @@ -15,7 +14,8 @@ import { VIDEO_NAME, VIDEO_PRIVACY, VIDEO_TAGS -} from '../../../shared/forms/form-validators' +} from '../../../shared/forms/form-validators/video' +import { VideoEdit } from '../../../shared/video/video-edit.model' @Component({ selector: 'my-video-edit', @@ -28,6 +28,7 @@ export class VideoEditComponent implements OnInit { @Input() formErrors: { [ id: string ]: string } = {} @Input() validationMessages: ValidatorMessage = {} @Input() videoPrivacies = [] + @Input() userVideoChannels = [] tags: string[] = [] videoCategories = [] @@ -51,6 +52,7 @@ export class VideoEditComponent implements OnInit { updateForm () { this.formErrors['name'] = '' this.formErrors['privacy'] = '' + this.formErrors['channelId'] = '' this.formErrors['category'] = '' this.formErrors['licence'] = '' this.formErrors['language'] = '' @@ -58,6 +60,7 @@ export class VideoEditComponent implements OnInit { this.validationMessages['name'] = VIDEO_NAME.MESSAGES this.validationMessages['privacy'] = VIDEO_PRIVACY.MESSAGES + this.validationMessages['channelId'] = VIDEO_CHANNEL.MESSAGES this.validationMessages['category'] = VIDEO_CATEGORY.MESSAGES this.validationMessages['licence'] = VIDEO_LICENCE.MESSAGES this.validationMessages['language'] = VIDEO_LANGUAGE.MESSAGES @@ -65,6 +68,7 @@ export class VideoEditComponent implements OnInit { this.form.addControl('name', new FormControl('', VIDEO_NAME.VALIDATORS)) this.form.addControl('privacy', new FormControl('', VIDEO_PRIVACY.VALIDATORS)) + this.form.addControl('channelId', new FormControl({ value: '', disabled: true })) this.form.addControl('nsfw', new FormControl(false)) this.form.addControl('category', new FormControl('', VIDEO_CATEGORY.VALIDATORS)) this.form.addControl('licence', new FormControl('', VIDEO_LICENCE.VALIDATORS))