aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/shared/video-blacklist/video-blacklist.service.ts9
-rw-r--r--client/src/app/shared/video/video-miniature.component.html2
-rw-r--r--client/src/app/shared/video/video-miniature.component.ts2
-rw-r--r--server/models/video/video-blacklist.ts1
4 files changed, 8 insertions, 6 deletions
diff --git a/client/src/app/shared/video-blacklist/video-blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts
index a9eab9b6f..d65da85fe 100644
--- a/client/src/app/shared/video-blacklist/video-blacklist.service.ts
+++ b/client/src/app/shared/video-blacklist/video-blacklist.service.ts
@@ -34,7 +34,7 @@ export class VideoBlacklistService {
34 ) 34 )
35 } 35 }
36 36
37 getAutoBlacklistedAsVideoList (videoPagination: ComponentPagination): Observable<{ videos: Video[], totalVideos: number}> { 37 getAutoBlacklistedAsVideoList (videoPagination: ComponentPagination): Observable<ResultList<Video>> {
38 const pagination = this.restService.componentPaginationToRestPagination(videoPagination) 38 const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
39 39
40 // prioritize first created since waiting longest 40 // prioritize first created since waiting longest
@@ -48,9 +48,10 @@ export class VideoBlacklistService {
48 return this.authHttp.get<ResultList<VideoBlacklist>>(VideoBlacklistService.BASE_VIDEOS_URL + 'blacklist', { params }) 48 return this.authHttp.get<ResultList<VideoBlacklist>>(VideoBlacklistService.BASE_VIDEOS_URL + 'blacklist', { params })
49 .pipe( 49 .pipe(
50 map(res => { 50 map(res => {
51 const videos = res.data.map(videoBlacklist => new Video(videoBlacklist.video)) 51 return {
52 const totalVideos = res.total 52 total: res.total,
53 return { videos, totalVideos } 53 data: res.data.map(videoBlacklist => new Video(videoBlacklist.video))
54 }
54 }), 55 }),
55 catchError(res => this.restExtractor.handleError(res)) 56 catchError(res => this.restExtractor.handleError(res))
56 ) 57 )
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 }
diff --git a/server/models/video/video-blacklist.ts b/server/models/video/video-blacklist.ts
index 22d949da0..18a1b8b4b 100644
--- a/server/models/video/video-blacklist.ts
+++ b/server/models/video/video-blacklist.ts
@@ -64,7 +64,6 @@ export class VideoBlacklistModel extends Model<VideoBlacklistModel> {
64 const countQuery = buildBaseQuery() 64 const countQuery = buildBaseQuery()
65 65
66 const findQuery = buildBaseQuery() 66 const findQuery = buildBaseQuery()
67 findQuery.subQuery = false
68 findQuery.include = [ 67 findQuery.include = [
69 { 68 {
70 model: VideoModel, 69 model: VideoModel,