aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2020-09-04 10:47:52 +0200
committerChocobozzz <me@florianbigard.com>2020-09-04 10:47:52 +0200
commit30b1e1060371f5f2578910f3f4a2cdf95fe78274 (patch)
treed35abe9abfdaf40dbd5d5d0cc31bb6fc94308f69
parent865af3fd7b192bda44dea65c6df125f233424f3e (diff)
downloadPeerTube-30b1e1060371f5f2578910f3f4a2cdf95fe78274.tar.gz
PeerTube-30b1e1060371f5f2578910f3f4a2cdf95fe78274.tar.zst
PeerTube-30b1e1060371f5f2578910f3f4a2cdf95fe78274.zip
Fix privacy/channel select on upload
-rw-r--r--client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts4
-rw-r--r--client/src/app/shared/shared-forms/select/select-options.component.html1
-rw-r--r--client/src/app/shared/shared-forms/select/select-options.component.ts5
3 files changed, 6 insertions, 4 deletions
diff --git a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
index 416b655a4..32a17052a 100644
--- a/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/+videos/+video-edit/video-add-components/video-upload.component.ts
@@ -185,9 +185,9 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
185 185
186 this.form.patchValue({ 186 this.form.patchValue({
187 name, 187 name,
188 privacy, 188 privacy: this.firstStepPrivacyId,
189 nsfw, 189 nsfw,
190 channelId, 190 channelId: this.firstStepChannelId,
191 previewfile: this.previewfileUpload 191 previewfile: this.previewfileUpload
192 }) 192 })
193 193
diff --git a/client/src/app/shared/shared-forms/select/select-options.component.html b/client/src/app/shared/shared-forms/select/select-options.component.html
index 48eca1cf5..6d0d7e925 100644
--- a/client/src/app/shared/shared-forms/select/select-options.component.html
+++ b/client/src/app/shared/shared-forms/select/select-options.component.html
@@ -4,6 +4,7 @@
4 [(ngModel)]="selectedId" 4 [(ngModel)]="selectedId"
5 (ngModelChange)="onModelChange()" 5 (ngModelChange)="onModelChange()"
6 [clearable]="clearable" 6 [clearable]="clearable"
7 [labelForId]="labelForId"
7 [searchable]="searchable" 8 [searchable]="searchable"
8 9
9 bindLabel="label" 10 bindLabel="label"
diff --git a/client/src/app/shared/shared-forms/select/select-options.component.ts b/client/src/app/shared/shared-forms/select/select-options.component.ts
index 3ba24c732..f0abd1a68 100644
--- a/client/src/app/shared/shared-forms/select/select-options.component.ts
+++ b/client/src/app/shared/shared-forms/select/select-options.component.ts
@@ -1,5 +1,5 @@
1import { Component, Input, forwardRef } from '@angular/core' 1import { Component, forwardRef, Input } from '@angular/core'
2import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms' 2import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
3 3
4export type SelectOptionsItem = { 4export type SelectOptionsItem = {
5 id: string | number 5 id: string | number
@@ -26,6 +26,7 @@ export class SelectOptionsComponent implements ControlValueAccessor {
26 @Input() clearable = false 26 @Input() clearable = false
27 @Input() searchable = false 27 @Input() searchable = false
28 @Input() groupBy: string 28 @Input() groupBy: string
29 @Input() labelForId: string
29 30
30 selectedId: number | string 31 selectedId: number | string
31 32