github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 04:08:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: hide emails on admin user list for moderators (#6781)

Browse Source
This commit is contained in:
Maja Komel
2018-12-19 10:24:57 +01:00
committed by Régis Hanol
parent 2fcbbead45
commit 0ce5f05b2a
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/serializers/admin_user_list_serializer.rb
View File

@ -38,8 +38,8 @@ class AdminUserListSerializer < BasicUserSerializer
def include_email?
# staff members can always see their email
(scope.is_staff? && object.id == scope.user.id) || scope.can_see_emails? ||
(scope.is_staff? && object.staged?)
(scope.is_staff? && (object.id == scope.user.id || object.staged?)) ||
(scope.is_admin? && scope.can_see_emails?)
end
alias_method :include_secondary_emails?, :include_email?