IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

UX: display 'merge' button in all non-staff user profiles.

Browse Source
This commit is contained in:
Vinoth Kannan
2020-04-22 17:42:09 +05:30
parent c8fed90e4e
commit e5c44f6dcf
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/guardian/user_guardian.rb
View File

@@ -76,8 +76,12 @@ module UserGuardian
is_staff? && !user.nil? && !user.staff?
end
def can_merge_user?(source_user, target_user)
is_admin? && !source_user.nil? && !source_user.staff? && !target_user.nil?
def can_merge_user?(user)
is_admin? && !user.nil? && !user.staff?
end
def can_merge_users?(source_user, target_user)
can_merge_user?(source_user) && !target_user.nil?
end
def can_reset_bounce_score?(user)