OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix privacy label display

pull/1765/head
Chocobozzz 2019-04-08 09:33:37 +02:00
parent 0a57bbff21
commit abf325b4f6
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/shared/video/abstract-video-list.html
View File

@ -24,7 +24,7 @@
> >
<my-video-miniature <my-video-miniature
*ngFor="let video of videos; trackBy: videoById" [video]="video" [user]="user" [ownerDisplayType]="ownerDisplayType" *ngFor="let video of videos; trackBy: videoById" [video]="video" [user]="user" [ownerDisplayType]="ownerDisplayType"
[displayVideoActions]="displayVideoActions" [displayVideoActions]="displayVideoActions" [displayOptions]="displayOptions"
(videoBlacklisted)="removeVideoFromArray(video)" (videoRemoved)="removeVideoFromArray(video)" (videoBlacklisted)="removeVideoFromArray(video)" (videoRemoved)="removeVideoFromArray(video)"
> >
</my-video-miniature> </my-video-miniature>

12
client/src/app/shared/video/abstract-video-list.ts
View File

@ -7,7 +7,7 @@ import { ComponentPagination } from '../rest/component-pagination.model'
import { VideoSortField } from './sort-field.type' import { VideoSortField } from './sort-field.type'
import { Video } from './video.model' import { Video } from './video.model'
import { ScreenService } from '@app/shared/misc/screen.service' import { ScreenService } from '@app/shared/misc/screen.service'
import { OwnerDisplayType } from '@app/shared/video/video-miniature.component' import { MiniatureDisplayOptions, OwnerDisplayType } from '@app/shared/video/video-miniature.component'
import { Syndication } from '@app/shared/video/syndication.model' import { Syndication } from '@app/shared/video/syndication.model'
import { Notifier, ServerService } from '@app/core' import { Notifier, ServerService } from '@app/core'
import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook' import { DisableForReuseHook } from '@app/core/routing/disable-for-reuse-hook'
@ -34,6 +34,16 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor
disabled = false disabled = false
displayOptions: MiniatureDisplayOptions = {
date: true,
views: true,
by: true,
privacyLabel: true,
privacyText: false,
state: false,
blacklistInfo: false
}
protected abstract notifier: Notifier protected abstract notifier: Notifier
protected abstract authService: AuthService protected abstract authService: AuthService
protected abstract route: ActivatedRoute protected abstract route: ActivatedRoute