diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-02 20:50:42 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-10 21:12:05 +0200 |
commit | 5baee5fca418487e72ddcd6419d31bca8659b668 (patch) | |
tree | 6604cc16d42152f4929d888565d2d435e2480d47 /client/src/app/shared/forms/form-validators | |
parent | d840487fed32b4604b02030c0d7464afa925904f (diff) | |
download | PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.tar.gz PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.tar.zst PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.zip |
rename blacklist to block/blocklist, merge block and auto-block views
- also replace whitelist with allowlist
- add advanced filters for video-block-list view
- move icons in video-block-list and video-abuse-list to left side
for visibility
- add robot icon to depict automated nature of a block in
video-block-list
resolves #2790
Diffstat (limited to 'client/src/app/shared/forms/form-validators')
-rw-r--r-- | client/src/app/shared/forms/form-validators/index.ts | 2 | ||||
-rw-r--r-- | client/src/app/shared/forms/form-validators/video-block-validators.service.ts (renamed from client/src/app/shared/forms/form-validators/video-blacklist-validators.service.ts) | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/client/src/app/shared/forms/form-validators/index.ts b/client/src/app/shared/forms/form-validators/index.ts index e3de3ae13..4a01b1622 100644 --- a/client/src/app/shared/forms/form-validators/index.ts +++ b/client/src/app/shared/forms/form-validators/index.ts | |||
@@ -6,7 +6,7 @@ export * from './login-validators.service' | |||
6 | export * from './reset-password-validators.service' | 6 | export * from './reset-password-validators.service' |
7 | export * from './user-validators.service' | 7 | export * from './user-validators.service' |
8 | export * from './video-abuse-validators.service' | 8 | export * from './video-abuse-validators.service' |
9 | export * from './video-blacklist-validators.service' | 9 | export * from './video-block-validators.service' |
10 | export * from './video-channel-validators.service' | 10 | export * from './video-channel-validators.service' |
11 | export * from './video-comment-validators.service' | 11 | export * from './video-comment-validators.service' |
12 | export * from './video-validators.service' | 12 | export * from './video-validators.service' |
diff --git a/client/src/app/shared/forms/form-validators/video-blacklist-validators.service.ts b/client/src/app/shared/forms/form-validators/video-block-validators.service.ts index 07d1f264a..dc8257761 100644 --- a/client/src/app/shared/forms/form-validators/video-blacklist-validators.service.ts +++ b/client/src/app/shared/forms/form-validators/video-block-validators.service.ts | |||
@@ -4,15 +4,15 @@ import { Injectable } from '@angular/core' | |||
4 | import { BuildFormValidator } from '@app/shared' | 4 | import { BuildFormValidator } from '@app/shared' |
5 | 5 | ||
6 | @Injectable() | 6 | @Injectable() |
7 | export class VideoBlacklistValidatorsService { | 7 | export class VideoBlockValidatorsService { |
8 | readonly VIDEO_BLACKLIST_REASON: BuildFormValidator | 8 | readonly VIDEO_BLOCK_REASON: BuildFormValidator |
9 | 9 | ||
10 | constructor (private i18n: I18n) { | 10 | constructor (private i18n: I18n) { |
11 | this.VIDEO_BLACKLIST_REASON = { | 11 | this.VIDEO_BLOCK_REASON = { |
12 | VALIDATORS: [ Validators.minLength(2), Validators.maxLength(300) ], | 12 | VALIDATORS: [ Validators.minLength(2), Validators.maxLength(300) ], |
13 | MESSAGES: { | 13 | MESSAGES: { |
14 | 'minlength': this.i18n('Blacklist reason must be at least 2 characters long.'), | 14 | 'minlength': this.i18n('Block reason must be at least 2 characters long.'), |
15 | 'maxlength': this.i18n('Blacklist reason cannot be more than 300 characters long.') | 15 | 'maxlength': this.i18n('Block reason cannot be more than 300 characters long.') |
16 | } | 16 | } |
17 | } | 17 | } |
18 | } | 18 | } |