Merge branch 'blacklist' into 'develop'

rename blacklist to block/blocklist, merge block and auto-block views

See merge request framasoft/peertube/PeerTube!30

1 files changed, 3 insertions, 3 deletions

diff --git a/client/src/app/+admin/moderation/moderation.component.ts b/client/src/app/+admin/moderation/moderation.component.ts
index 7744deb06..1b1df6f09 100644
--- a/client/src/app/+admin/moderation/moderation.component.ts
+++ b/client/src/app/+admin/moderation/moderation.component.ts
@@ -7,7 +7,7 @@ import { AuthService, ServerService } from '@app/core'
   styleUrls: [ './moderation.component.scss' ]
 })
 export class ModerationComponent implements OnInit {
-  autoBlacklistVideosEnabled = false
+  autoBlockVideosEnabled = false
 
   constructor (
     private auth: AuthService,
@@ -16,7 +16,7 @@ export class ModerationComponent implements OnInit {
 
   ngOnInit (): void {
     this.serverService.getConfig()
-      .subscribe(config => this.autoBlacklistVideosEnabled = config.autoBlacklist.videos.ofUsers.enabled)
+      .subscribe(config => this.autoBlockVideosEnabled = config.autoBlacklist.videos.ofUsers.enabled)
 
   }
 
@@ -24,7 +24,7 @@ export class ModerationComponent implements OnInit {
     return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_ABUSES)
   }
 
-  hasVideoBlacklistRight () {
+  hasVideoBlocklistRight () {
     return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
   }