Merge pull request #4631 from tgxworld/prevent_users_from_changing_permissions_of_non_real_users

FIX: Do not allow admins to meddle with admin and moderation access o…
This commit is contained in:
Guo Xiang Tan
2017-01-04 09:10:27 +08:00
committed by GitHub
2 changed files with 26 additions and 6 deletions
+3 -3
View File
@@ -177,7 +177,7 @@ class Guardian
end
def can_grant_admin?(user)
can_administer_user?(user) && not(user.admin?)
can_administer_user?(user) && !user.admin?
end
def can_revoke_moderation?(moderator)
@@ -185,7 +185,7 @@ class Guardian
end
def can_grant_moderation?(user)
can_administer?(user) && not(user.moderator?)
can_administer?(user) && !user.moderator?
end
def can_grant_title?(user)
@@ -313,7 +313,7 @@ class Guardian
end
def can_administer?(obj)
is_admin? && obj.present?
is_admin? && obj.present? && obj.id&.positive?
end
def can_administer_user?(other_user)