From dc60128355170691ceb8065584a3335f8507a620 Mon Sep 17 00:00:00 2001
From: Tarek Khalil <45508821+khalilovcmded@users.noreply.github.com>
Date: Tue, 23 Apr 2019 14:47:37 +0100
Subject: [PATCH] FIX: Hide ignoring users in preference for users with TL less
 than a member (#7415)

* FIX: Hide ignoring users in preference for users with TL less than a member
---
 .../controllers/preferences/users.js.es6       |  2 ++
 .../discourse/templates/preferences/users.hbs  | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
index 03d765eeb6a..4bb9a8885e4 100644
--- a/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/preferences/users.js.es6
@@ -6,6 +6,8 @@ import User from "discourse/models/user";
 export default Ember.Controller.extend(PreferencesTabController, {
   saveAttrNames: ["muted_usernames", "ignored_usernames"],
   ignoredUsernames: Ember.computed.alias("model.ignored_usernames"),
+  userIsMemberOrAbove: Ember.computed.gte("model.trust_level", 2),
+  ignoredEnabled: Ember.computed.or("userIsMemberOrAbove", "model.staff"),
   actions: {
     ignoredUsernamesChanged(previous, current) {
       if (current.length > previous.length) {
diff --git a/app/assets/javascripts/discourse/templates/preferences/users.hbs b/app/assets/javascripts/discourse/templates/preferences/users.hbs
index 7a89a353077..07b31099238 100644
--- a/app/assets/javascripts/discourse/templates/preferences/users.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/users.hbs
@@ -6,14 +6,16 @@
   </div>
   <div class="instructions">{{i18n 'user.muted_users_instructions'}}</div>
 
-  <div class="controls tracking-controls">
-    <label>{{d-icon "eye-slash" class="icon"}} {{i18n 'user.ignored_users'}}</label>
-    {{user-selector excludeCurrentUser=true
-                    usernames=model.ignored_usernames
-                    onChangeCallback=(action "ignoredUsernamesChanged")
-                    class="user-selector"}}
-  </div>
-  <div class="instructions">{{i18n 'user.ignored_users_instructions'}}</div>
+  {{#if ignoredEnabled}}
+    <div class="controls tracking-controls">
+      <label>{{d-icon "eye-slash" class="icon"}} {{i18n 'user.ignored_users'}}</label>
+      {{user-selector excludeCurrentUser=true
+                      usernames=model.ignored_usernames
+                      onChangeCallback=(action "ignoredUsernamesChanged")
+                      class="user-selector"}}
+    </div>
+    <div class="instructions">{{i18n 'user.ignored_users_instructions'}}</div>
+  {{/if}}
 </div>
 
 {{plugin-outlet name="user-preferences-notifications" args=(hash model=model save=(action "save"))}}