aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-07-16 15:24:50 +0200
committerChocobozzz <me@florianbigard.com>2018-07-16 15:24:50 +0200
commit329d9086601b7ae2127be12166ee8c892c289c6e (patch)
tree36bafacfcf438a14517a91f6614be64cedbe0854
parent025c9794674b49ed3600a65d4608dd5677f0bcf4 (diff)
downloadPeerTube-329d9086601b7ae2127be12166ee8c892c289c6e.tar.gz
PeerTube-329d9086601b7ae2127be12166ee8c892c289c6e.tar.zst
PeerTube-329d9086601b7ae2127be12166ee8c892c289c6e.zip
Do not display private privacy if the video is not private
-rw-r--r--client/src/app/shared/video-caption/video-caption.service.ts4
-rw-r--r--client/src/app/videos/+video-edit/video-update.component.ts2
2 files changed, 4 insertions, 2 deletions
diff --git a/client/src/app/shared/video-caption/video-caption.service.ts b/client/src/app/shared/video-caption/video-caption.service.ts
index 4ae8ebd0a..d1444902d 100644
--- a/client/src/app/shared/video-caption/video-caption.service.ts
+++ b/client/src/app/shared/video-caption/video-caption.service.ts
@@ -1,7 +1,7 @@
1import { catchError, map } from 'rxjs/operators' 1import { catchError, map } from 'rxjs/operators'
2import { HttpClient } from '@angular/common/http' 2import { HttpClient } from '@angular/common/http'
3import { Injectable } from '@angular/core' 3import { Injectable } from '@angular/core'
4import { forkJoin, Observable } from 'rxjs' 4import { forkJoin, Observable, of } from 'rxjs'
5import { ResultList } from '../../../../../shared' 5import { ResultList } from '../../../../../shared'
6import { RestExtractor, RestService } from '../rest' 6import { RestExtractor, RestService } from '../rest'
7import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model' 7import { VideoCaption } from '../../../../../shared/models/videos/video-caption.model'
@@ -42,6 +42,8 @@ export class VideoCaptionService {
42 } 42 }
43 43
44 updateCaptions (videoId: number | string, videoCaptions: VideoCaptionEdit[]) { 44 updateCaptions (videoId: number | string, videoCaptions: VideoCaptionEdit[]) {
45 if (videoCaptions.length === 0) return of(true)
46
45 const observables: Observable<any>[] = [] 47 const observables: Observable<any>[] = []
46 48
47 for (const videoCaption of videoCaptions) { 49 for (const videoCaption of videoCaptions) {
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 b67874401..72fcc8659 100644
--- a/client/src/app/videos/+video-edit/video-update.component.ts
+++ b/client/src/app/videos/+video-edit/video-update.component.ts
@@ -84,7 +84,7 @@ export class VideoUpdateComponent extends FormReactive implements OnInit {
84 84
85 // We cannot set private a video that was not private 85 // We cannot set private a video that was not private
86 if (this.video.privacy !== VideoPrivacy.PRIVATE) { 86 if (this.video.privacy !== VideoPrivacy.PRIVATE) {
87 this.videoPrivacies = this.videoPrivacies.filter(p => p.id !== VideoPrivacy.PRIVATE) 87 this.videoPrivacies = this.videoPrivacies.filter(p => p.id.toString() !== VideoPrivacy.PRIVATE.toString())
88 } else { // We can schedule video publication only if it it is private 88 } else { // We can schedule video publication only if it it is private
89 this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE 89 this.schedulePublicationPossible = this.video.privacy === VideoPrivacy.PRIVATE
90 } 90 }