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 /server/controllers | |
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 'server/controllers')
-rw-r--r-- | server/controllers/api/videos/blacklist.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts index 3b25ceea2..2c6948923 100644 --- a/server/controllers/api/videos/blacklist.ts +++ b/server/controllers/api/videos/blacklist.ts | |||
@@ -23,14 +23,14 @@ const blacklistRouter = express.Router() | |||
23 | 23 | ||
24 | blacklistRouter.post('/:videoId/blacklist', | 24 | blacklistRouter.post('/:videoId/blacklist', |
25 | authenticate, | 25 | authenticate, |
26 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), | 26 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLOCKS), |
27 | asyncMiddleware(videosBlacklistAddValidator), | 27 | asyncMiddleware(videosBlacklistAddValidator), |
28 | asyncMiddleware(addVideoToBlacklistController) | 28 | asyncMiddleware(addVideoToBlacklistController) |
29 | ) | 29 | ) |
30 | 30 | ||
31 | blacklistRouter.get('/blacklist', | 31 | blacklistRouter.get('/blacklist', |
32 | authenticate, | 32 | authenticate, |
33 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), | 33 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLOCKS), |
34 | paginationValidator, | 34 | paginationValidator, |
35 | blacklistSortValidator, | 35 | blacklistSortValidator, |
36 | setBlacklistSort, | 36 | setBlacklistSort, |
@@ -41,14 +41,14 @@ blacklistRouter.get('/blacklist', | |||
41 | 41 | ||
42 | blacklistRouter.put('/:videoId/blacklist', | 42 | blacklistRouter.put('/:videoId/blacklist', |
43 | authenticate, | 43 | authenticate, |
44 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), | 44 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLOCKS), |
45 | asyncMiddleware(videosBlacklistUpdateValidator), | 45 | asyncMiddleware(videosBlacklistUpdateValidator), |
46 | asyncMiddleware(updateVideoBlacklistController) | 46 | asyncMiddleware(updateVideoBlacklistController) |
47 | ) | 47 | ) |
48 | 48 | ||
49 | blacklistRouter.delete('/:videoId/blacklist', | 49 | blacklistRouter.delete('/:videoId/blacklist', |
50 | authenticate, | 50 | authenticate, |
51 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), | 51 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLOCKS), |
52 | asyncMiddleware(videosBlacklistRemoveValidator), | 52 | asyncMiddleware(videosBlacklistRemoveValidator), |
53 | asyncMiddleware(removeVideoFromBlacklistController) | 53 | asyncMiddleware(removeVideoFromBlacklistController) |
54 | ) | 54 | ) |