diff options
author | Chocobozzz <me@florianbigard.com> | 2020-08-11 09:22:42 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-08-11 09:41:55 +0200 |
commit | 9abd170dec9a0b929da1f0947e3c7019e38631da (patch) | |
tree | d43418b375d306dcf96af1e9c2f8b6a6775e6e22 /client/src/app/+videos | |
parent | 02c01341f4dae30ec6b81fcb644952393d73c4a8 (diff) | |
download | PeerTube-9abd170dec9a0b929da1f0947e3c7019e38631da.tar.gz PeerTube-9abd170dec9a0b929da1f0947e3c7019e38631da.tar.zst PeerTube-9abd170dec9a0b929da1f0947e3c7019e38631da.zip |
Fix tags in search filters
Diffstat (limited to 'client/src/app/+videos')
3 files changed, 9 insertions, 6 deletions
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 4cd3838de..48c5508f4 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 | |||
@@ -1,16 +1,17 @@ | |||
1 | import { forkJoin } from 'rxjs' | ||
1 | import { map } from 'rxjs/operators' | 2 | import { map } from 'rxjs/operators' |
2 | import { Component, Input, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' | 3 | import { Component, Input, NgZone, OnDestroy, OnInit, ViewChild } from '@angular/core' |
3 | import { FormArray, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms' | 4 | import { FormArray, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms' |
4 | import { ServerService } from '@app/core' | 5 | import { ServerService } from '@app/core' |
5 | import { removeElementFromArray } from '@app/helpers' | 6 | import { removeElementFromArray } from '@app/helpers' |
6 | import { FormReactiveValidationMessages, FormValidatorService, VideoValidatorsService } from '@app/shared/shared-forms' | 7 | import { FormReactiveValidationMessages, FormValidatorService, VideoValidatorsService } from '@app/shared/shared-forms' |
8 | import { SelectChannelItem } from '@app/shared/shared-forms/select-channel.component' | ||
9 | import { InstanceService } from '@app/shared/shared-instance' | ||
7 | import { VideoCaptionEdit, VideoEdit, VideoService } from '@app/shared/shared-main' | 10 | import { VideoCaptionEdit, VideoEdit, VideoService } from '@app/shared/shared-main' |
11 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
8 | import { ServerConfig, VideoConstant, VideoPrivacy } from '@shared/models' | 12 | import { ServerConfig, VideoConstant, VideoPrivacy } from '@shared/models' |
9 | import { I18nPrimengCalendarService } from './i18n-primeng-calendar.service' | 13 | import { I18nPrimengCalendarService } from './i18n-primeng-calendar.service' |
10 | import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component' | 14 | import { VideoCaptionAddModalComponent } from './video-caption-add-modal.component' |
11 | import { I18n } from '@ngx-translate/i18n-polyfill' | ||
12 | import { forkJoin } from 'rxjs' | ||
13 | import { InstanceService } from '@app/shared/shared-instance' | ||
14 | 15 | ||
15 | type VideoLanguages = VideoConstant<string> & { group?: string } | 16 | type VideoLanguages = VideoConstant<string> & { group?: string } |
16 | 17 | ||
@@ -23,7 +24,7 @@ export class VideoEditComponent implements OnInit, OnDestroy { | |||
23 | @Input() form: FormGroup | 24 | @Input() form: FormGroup |
24 | @Input() formErrors: { [ id: string ]: string } = {} | 25 | @Input() formErrors: { [ id: string ]: string } = {} |
25 | @Input() validationMessages: FormReactiveValidationMessages = {} | 26 | @Input() validationMessages: FormReactiveValidationMessages = {} |
26 | @Input() userVideoChannels: { id: number, label: string, support: string }[] = [] | 27 | @Input() userVideoChannels: SelectChannelItem[] = [] |
27 | @Input() schedulePublicationPossible = true | 28 | @Input() schedulePublicationPossible = true |
28 | @Input() videoCaptions: (VideoCaptionEdit & { captionPath?: string })[] = [] | 29 | @Input() videoCaptions: (VideoCaptionEdit & { captionPath?: string })[] = [] |
29 | @Input() waitTranscodingEnabled = true | 30 | @Input() waitTranscodingEnabled = true |
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 86f2b376f..c55e5f923 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,6 +3,7 @@ import { Directive, EventEmitter, OnInit } from '@angular/core' | |||
3 | import { AuthService, CanComponentDeactivateResult, Notifier, ServerService } from '@app/core' | 3 | import { AuthService, CanComponentDeactivateResult, Notifier, ServerService } from '@app/core' |
4 | import { populateAsyncUserVideoChannels } from '@app/helpers' | 4 | import { populateAsyncUserVideoChannels } from '@app/helpers' |
5 | import { FormReactive } from '@app/shared/shared-forms' | 5 | import { FormReactive } from '@app/shared/shared-forms' |
6 | import { SelectChannelItem } from '@app/shared/shared-forms/select-channel.component' | ||
6 | import { VideoCaptionEdit, VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main' | 7 | import { VideoCaptionEdit, VideoCaptionService, VideoEdit, VideoService } from '@app/shared/shared-main' |
7 | import { LoadingBarService } from '@ngx-loading-bar/core' | 8 | import { LoadingBarService } from '@ngx-loading-bar/core' |
8 | import { ServerConfig, VideoConstant, VideoPrivacy } from '@shared/models' | 9 | import { ServerConfig, VideoConstant, VideoPrivacy } from '@shared/models' |
@@ -10,7 +11,7 @@ import { ServerConfig, VideoConstant, VideoPrivacy } from '@shared/models' | |||
10 | @Directive() | 11 | @Directive() |
11 | // tslint:disable-next-line: directive-class-suffix | 12 | // tslint:disable-next-line: directive-class-suffix |
12 | export abstract class VideoSend extends FormReactive implements OnInit { | 13 | export abstract class VideoSend extends FormReactive implements OnInit { |
13 | userVideoChannels: { id: number, label: string, support: string, avatarPath?: string }[] = [] | 14 | userVideoChannels: SelectChannelItem[] = [] |
14 | videoPrivacies: VideoConstant<VideoPrivacy>[] = [] | 15 | videoPrivacies: VideoConstant<VideoPrivacy>[] = [] |
15 | videoCaptions: VideoCaptionEdit[] = [] | 16 | videoCaptions: VideoCaptionEdit[] = [] |
16 | 17 | ||
diff --git a/client/src/app/+videos/+video-edit/video-update.component.ts b/client/src/app/+videos/+video-edit/video-update.component.ts index de4f65df3..263c71f3b 100644 --- a/client/src/app/+videos/+video-edit/video-update.component.ts +++ b/client/src/app/+videos/+video-edit/video-update.component.ts | |||
@@ -3,6 +3,7 @@ import { Component, HostListener, OnInit } from '@angular/core' | |||
3 | import { ActivatedRoute, Router } from '@angular/router' | 3 | import { ActivatedRoute, Router } from '@angular/router' |
4 | import { Notifier } from '@app/core' | 4 | import { Notifier } from '@app/core' |
5 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' | 5 | import { FormReactive, FormValidatorService } from '@app/shared/shared-forms' |
6 | import { SelectChannelItem } from '@app/shared/shared-forms/select-channel.component' | ||
6 | import { VideoCaptionEdit, VideoCaptionService, VideoDetails, VideoEdit, VideoService } from '@app/shared/shared-main' | 7 | import { VideoCaptionEdit, VideoCaptionService, VideoDetails, VideoEdit, VideoService } from '@app/shared/shared-main' |
7 | import { LoadingBarService } from '@ngx-loading-bar/core' | 8 | import { LoadingBarService } from '@ngx-loading-bar/core' |
8 | import { I18n } from '@ngx-translate/i18n-polyfill' | 9 | import { I18n } from '@ngx-translate/i18n-polyfill' |
@@ -17,7 +18,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit { | |||
17 | video: VideoEdit | 18 | video: VideoEdit |
18 | 19 | ||
19 | isUpdatingVideo = false | 20 | isUpdatingVideo = false |
20 | userVideoChannels: { id: number, label: string, support: string, avatar?: string }[] = [] | 21 | userVideoChannels: SelectChannelItem[] = [] |
21 | schedulePublicationPossible = false | 22 | schedulePublicationPossible = false |
22 | videoCaptions: VideoCaptionEdit[] = [] | 23 | videoCaptions: VideoCaptionEdit[] = [] |
23 | waitTranscodingEnabled = true | 24 | waitTranscodingEnabled = true |