about summary refs log tree commit diff
path: root/app/policies
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-08-23 23:26:29 +0200
committerGitHub <noreply@github.com>2018-08-23 23:26:29 +0200
commit2f34b747b3f765a37d7b23e70de42005c0b62f58 (patch)
tree4fbfe29446c9ebdfe8a072ba07a71218613eb32f /app/policies
parent9d58daac6c860b599f8c266b8bb10c6170220dd3 (diff)
Allow mods to disable login, improve message when login disabled (#8329)
* Allow moderators to disable/enable login

* Instead of rejecting login, show forbidden error when login disabled

Avoid confusion because when login is rejected, the message is that
the account is not activated, which is wrong.

* Fix tests
Diffstat (limited to 'app/policies')
-rw-r--r--app/policies/user_policy.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
index dabdf707a..57af5c61c 100644
--- a/app/policies/user_policy.rb
+++ b/app/policies/user_policy.rb
@@ -18,11 +18,11 @@ class UserPolicy < ApplicationPolicy
   end
 
   def enable?
-    admin?
+    staff?
   end
 
   def disable?
-    admin? && !record.admin?
+    staff? && !record.admin?
   end
 
   def promote?