aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared/video
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-09-05 10:19:35 +0200
committerChocobozzz <me@florianbigard.com>2019-09-05 10:19:35 +0200
commit00aab0666c6f772548c160fdfa871a8843b88f37 (patch)
tree73958f6f5d41371980f9653c8cb0ed8f46683c5a /client/src/app/shared/video
parentbe04c6fdab5d91a7a57fa3ff36cde22a549c29da (diff)
parent951532924c1b3fd547cbf45f0c9cf9734203d6b4 (diff)
downloadPeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.tar.gz
PeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.tar.zst
PeerTube-00aab0666c6f772548c160fdfa871a8843b88f37.zip
Merge branch 'release/1.4.0' into develop
Diffstat (limited to 'client/src/app/shared/video')
-rw-r--r--client/src/app/shared/video/video-miniature.component.html2
-rw-r--r--client/src/app/shared/video/video-miniature.component.ts2
2 files changed, 3 insertions, 1 deletions
diff --git a/client/src/app/shared/video/video-miniature.component.html b/client/src/app/shared/video/video-miniature.component.html
index 51ca1393d..5d5691b75 100644
--- a/client/src/app/shared/video/video-miniature.component.html
+++ b/client/src/app/shared/video/video-miniature.component.html
@@ -31,7 +31,7 @@
31 31
32 <div class="video-info-privacy"> 32 <div class="video-info-privacy">
33 <ng-container *ngIf="displayOptions.privacyText">{{ video.privacy.label }}</ng-container> 33 <ng-container *ngIf="displayOptions.privacyText">{{ video.privacy.label }}</ng-container>
34 <ng-container *ngIf="displayOptions.privacyText && getStateLabel(video)"> - </ng-container> 34 <ng-container *ngIf="displayOptions.privacyText && displayOptions.state && getStateLabel(video)"> - </ng-container>
35 <ng-container *ngIf="displayOptions.state">{{ getStateLabel(video) }}</ng-container> 35 <ng-container *ngIf="displayOptions.state">{{ getStateLabel(video) }}</ng-container>
36 </div> 36 </div>
37 37
diff --git a/client/src/app/shared/video/video-miniature.component.ts b/client/src/app/shared/video/video-miniature.component.ts
index 48475033c..d5c7dfd9b 100644
--- a/client/src/app/shared/video/video-miniature.component.ts
+++ b/client/src/app/shared/video/video-miniature.component.ts
@@ -95,6 +95,8 @@ export class VideoMiniatureComponent implements OnInit {
95 } 95 }
96 96
97 getStateLabel (video: Video) { 97 getStateLabel (video: Video) {
98 if (!video.state) return ''
99
98 if (video.privacy.id !== VideoPrivacy.PRIVATE && video.state.id === VideoState.PUBLISHED) { 100 if (video.privacy.id !== VideoPrivacy.PRIVATE && video.state.id === VideoState.PUBLISHED) {
99 return this.i18n('Published') 101 return this.i18n('Published')
100 } 102 }