diff options
author | Chocobozzz <me@florianbigard.com> | 2021-09-03 10:27:04 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-09-03 16:35:18 +0200 |
commit | 6d210220be0875d63461829d83c6e3a59d05cf7a (patch) | |
tree | 60ec5b596ef06295b70ebb553920a39b549e0f13 /client/src/app/shared/shared-video-miniature | |
parent | 2ede07153ce0282b116345dfee09bff902355a75 (diff) | |
download | PeerTube-6d210220be0875d63461829d83c6e3a59d05cf7a.tar.gz PeerTube-6d210220be0875d63461829d83c6e3a59d05cf7a.tar.zst PeerTube-6d210220be0875d63461829d83c6e3a59d05cf7a.zip |
Fix NSFW filter and add tests
Diffstat (limited to 'client/src/app/shared/shared-video-miniature')
3 files changed, 3 insertions, 7 deletions
diff --git a/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts b/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts index 54a7c5dab..2c52e43f7 100644 --- a/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-filters-header.component.ts | |||
@@ -5,7 +5,6 @@ import { FormBuilder, FormGroup } from '@angular/forms' | |||
5 | import { AuthService } from '@app/core' | 5 | import { AuthService } from '@app/core' |
6 | import { ServerService } from '@app/core/server/server.service' | 6 | import { ServerService } from '@app/core/server/server.service' |
7 | import { UserRight } from '@shared/models' | 7 | import { UserRight } from '@shared/models' |
8 | import { NSFWPolicyType } from '@shared/models/videos' | ||
9 | import { PeertubeModalService } from '../shared-main' | 8 | import { PeertubeModalService } from '../shared-main' |
10 | import { VideoFilters } from './video-filters.model' | 9 | import { VideoFilters } from './video-filters.model' |
11 | 10 | ||
@@ -18,12 +17,7 @@ const logger = debug('peertube:videos:VideoFiltersHeaderComponent') | |||
18 | }) | 17 | }) |
19 | export class VideoFiltersHeaderComponent implements OnInit, OnDestroy { | 18 | export class VideoFiltersHeaderComponent implements OnInit, OnDestroy { |
20 | @Input() filters: VideoFilters | 19 | @Input() filters: VideoFilters |
21 | |||
22 | @Input() displayModerationBlock = false | 20 | @Input() displayModerationBlock = false |
23 | |||
24 | @Input() defaultSort = '-publishedAt' | ||
25 | @Input() nsfwPolicy: NSFWPolicyType | ||
26 | |||
27 | @Input() hideScope = false | 21 | @Input() hideScope = false |
28 | 22 | ||
29 | @Output() filtersChanged = new EventEmitter() | 23 | @Output() filtersChanged = new EventEmitter() |
diff --git a/client/src/app/shared/shared-video-miniature/video-filters.model.ts b/client/src/app/shared/shared-video-miniature/video-filters.model.ts index 920dc826c..f5095b85b 100644 --- a/client/src/app/shared/shared-video-miniature/video-filters.model.ts +++ b/client/src/app/shared/shared-video-miniature/video-filters.model.ts | |||
@@ -74,6 +74,8 @@ export class VideoFilters { | |||
74 | } | 74 | } |
75 | 75 | ||
76 | setNSFWPolicy (nsfwPolicy: NSFWPolicyType) { | 76 | setNSFWPolicy (nsfwPolicy: NSFWPolicyType) { |
77 | console.log(nsfwPolicy) | ||
78 | |||
77 | this.updateDefaultNSFW(nsfwPolicy) | 79 | this.updateDefaultNSFW(nsfwPolicy) |
78 | } | 80 | } |
79 | 81 | ||
diff --git a/client/src/app/shared/shared-video-miniature/videos-list.component.html b/client/src/app/shared/shared-video-miniature/videos-list.component.html index 08ed7b94c..67933f177 100644 --- a/client/src/app/shared/shared-video-miniature/videos-list.component.html +++ b/client/src/app/shared/shared-video-miniature/videos-list.component.html | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | <my-video-filters-header | 35 | <my-video-filters-header |
36 | *ngIf="displayFilters" [displayModerationBlock]="displayModerationBlock" [hideScope]="hideScopeFilter" | 36 | *ngIf="displayFilters" [displayModerationBlock]="displayModerationBlock" [hideScope]="hideScopeFilter" |
37 | [defaultSort]="defaultSort" [filters]="filters" | 37 | [filters]="filters" |
38 | (filtersChanged)="onFiltersChanged(true)" | 38 | (filtersChanged)="onFiltersChanged(true)" |
39 | ></my-video-filters-header> | 39 | ></my-video-filters-header> |
40 | 40 | ||