diff options
-rw-r--r-- | client/src/app/+my-library/my-videos/my-videos.component.ts | 3 | ||||
-rw-r--r-- | client/src/app/shared/shared-video-miniature/video-miniature.component.ts | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/client/src/app/+my-library/my-videos/my-videos.component.ts b/client/src/app/+my-library/my-videos/my-videos.component.ts index 2f1eb84ba..3ff0ee248 100644 --- a/client/src/app/+my-library/my-videos/my-videos.component.ts +++ b/client/src/app/+my-library/my-videos/my-videos.component.ts | |||
@@ -40,7 +40,8 @@ export class MyVideosComponent implements OnInit, DisableForReuseHook { | |||
40 | privacyLabel: false, | 40 | privacyLabel: false, |
41 | privacyText: true, | 41 | privacyText: true, |
42 | state: true, | 42 | state: true, |
43 | blacklistInfo: true | 43 | blacklistInfo: true, |
44 | forceChannelInBy: true | ||
44 | } | 45 | } |
45 | videoDropdownDisplayOptions: VideoActionsDisplayType = { | 46 | videoDropdownDisplayOptions: VideoActionsDisplayType = { |
46 | playlist: false, | 47 | playlist: false, |
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts index 534a78b3f..20596d6d0 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts | |||
@@ -21,13 +21,15 @@ import { VideoActionsDisplayType } from './video-actions-dropdown.component' | |||
21 | export type MiniatureDisplayOptions = { | 21 | export type MiniatureDisplayOptions = { |
22 | date?: boolean | 22 | date?: boolean |
23 | views?: boolean | 23 | views?: boolean |
24 | by?: boolean | ||
25 | avatar?: boolean | 24 | avatar?: boolean |
26 | privacyLabel?: boolean | 25 | privacyLabel?: boolean |
27 | privacyText?: boolean | 26 | privacyText?: boolean |
28 | state?: boolean | 27 | state?: boolean |
29 | blacklistInfo?: boolean | 28 | blacklistInfo?: boolean |
30 | nsfw?: boolean | 29 | nsfw?: boolean |
30 | |||
31 | by?: boolean | ||
32 | forceChannelInBy?: boolean | ||
31 | } | 33 | } |
32 | @Component({ | 34 | @Component({ |
33 | selector: 'my-video-miniature', | 35 | selector: 'my-video-miniature', |
@@ -47,7 +49,8 @@ export class VideoMiniatureComponent implements OnInit { | |||
47 | privacyLabel: false, | 49 | privacyLabel: false, |
48 | privacyText: false, | 50 | privacyText: false, |
49 | state: false, | 51 | state: false, |
50 | blacklistInfo: false | 52 | blacklistInfo: false, |
53 | forceChannelInBy: false | ||
51 | } | 54 | } |
52 | 55 | ||
53 | @Input() displayVideoActions = true | 56 | @Input() displayVideoActions = true |
@@ -267,6 +270,11 @@ export class VideoMiniatureComponent implements OnInit { | |||
267 | } | 270 | } |
268 | 271 | ||
269 | private setUpBy () { | 272 | private setUpBy () { |
273 | if (this.displayOptions.forceChannelInBy) { | ||
274 | this.ownerDisplayType = 'videoChannel' | ||
275 | return | ||
276 | } | ||
277 | |||
270 | const accountName = this.video.account.name | 278 | const accountName = this.video.account.name |
271 | 279 | ||
272 | // If the video channel name is an UUID (not really displayable, we changed this behaviour in v1.0.0-beta.12) | 280 | // If the video channel name is an UUID (not really displayable, we changed this behaviour in v1.0.0-beta.12) |