diff options
Diffstat (limited to 'client/src/app/search')
-rw-r--r-- | client/src/app/search/search.component.html | 2 | ||||
-rw-r--r-- | client/src/app/search/search.component.ts | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html index d723606db..6acdedf92 100644 --- a/client/src/app/search/search.component.html +++ b/client/src/app/search/search.component.html | |||
@@ -54,7 +54,7 @@ | |||
54 | <div *ngIf="isVideo(result)" class="entry video"> | 54 | <div *ngIf="isVideo(result)" class="entry video"> |
55 | <my-video-miniature | 55 | <my-video-miniature |
56 | [video]="result" [user]="user" [displayAsRow]="true" [displayVideoActions]="!hideActions()" | 56 | [video]="result" [user]="user" [displayAsRow]="true" [displayVideoActions]="!hideActions()" |
57 | [useLazyLoadUrl]="advancedSearch.searchTarget === 'search-index'" | 57 | [displayOptions]="videoDisplayOptions" [useLazyLoadUrl]="advancedSearch.searchTarget === 'search-index'" |
58 | (videoBlocked)="removeVideoFromArray(result)" (videoRemoved)="removeVideoFromArray(result)" | 58 | (videoBlocked)="removeVideoFromArray(result)" (videoRemoved)="removeVideoFromArray(result)" |
59 | ></my-video-miniature> | 59 | ></my-video-miniature> |
60 | </div> | 60 | </div> |
diff --git a/client/src/app/search/search.component.ts b/client/src/app/search/search.component.ts index 7ab0ed9d6..0439fdf51 100644 --- a/client/src/app/search/search.component.ts +++ b/client/src/app/search/search.component.ts | |||
@@ -8,11 +8,11 @@ import { SearchService } from '@app/search/search.service' | |||
8 | import { immutableAssign } from '@app/shared/misc/utils' | 8 | import { immutableAssign } from '@app/shared/misc/utils' |
9 | import { ComponentPagination } from '@app/shared/rest/component-pagination.model' | 9 | import { ComponentPagination } from '@app/shared/rest/component-pagination.model' |
10 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' | 10 | import { VideoChannel } from '@app/shared/video-channel/video-channel.model' |
11 | import { MiniatureDisplayOptions } from '@app/shared/video/video-miniature.component' | ||
11 | import { Video } from '@app/shared/video/video.model' | 12 | import { Video } from '@app/shared/video/video.model' |
12 | import { MetaService } from '@ngx-meta/core' | 13 | import { MetaService } from '@ngx-meta/core' |
13 | import { I18n } from '@ngx-translate/i18n-polyfill' | 14 | import { I18n } from '@ngx-translate/i18n-polyfill' |
14 | import { ServerConfig } from '@shared/models' | 15 | import { ServerConfig } from '@shared/models' |
15 | import { UserService } from '@app/shared' | ||
16 | import { SearchTargetType } from '@shared/models/search/search-target-query.model' | 16 | import { SearchTargetType } from '@shared/models/search/search-target-query.model' |
17 | 17 | ||
18 | @Component({ | 18 | @Component({ |
@@ -32,6 +32,17 @@ export class SearchComponent implements OnInit, OnDestroy { | |||
32 | isSearchFilterCollapsed = true | 32 | isSearchFilterCollapsed = true |
33 | currentSearch: string | 33 | currentSearch: string |
34 | 34 | ||
35 | videoDisplayOptions: MiniatureDisplayOptions = { | ||
36 | date: true, | ||
37 | views: true, | ||
38 | by: true, | ||
39 | avatar: false, | ||
40 | privacyLabel: false, | ||
41 | privacyText: false, | ||
42 | state: false, | ||
43 | blacklistInfo: false | ||
44 | } | ||
45 | |||
35 | errorMessage: string | 46 | errorMessage: string |
36 | serverConfig: ServerConfig | 47 | serverConfig: ServerConfig |
37 | 48 | ||