discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-06 11:19:51 +00: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/templates/user-index.hbs
View File

@ -683,6 +683,9 @@
icon="trash-alt" icon="trash-alt"
class="btn-danger" class="btn-danger"
action=(action "destroy")}} action=(action "destroy")}}
{{/if}}
{{#if model.can_be_merged}}
{{d-button label="admin.user.merge.transfer_and_delete" {{d-button label="admin.user.merge.transfer_and_delete"
icon="trash-alt" icon="trash-alt"
class="btn-danger" class="btn-danger"

2
app/controllers/admin/users_controller.rb
View File

@ -476,7 +476,7 @@ class Admin::UsersController < Admin::AdminController
target_username = params.require(:target_username) target_username = params.require(:target_username)
target_user = User.find_by_username(target_username) target_user = User.find_by_username(target_username)
guardian.ensure_can_merge_user!(@user, target_user) guardian.ensure_can_merge_users!(@user, target_user)
if user = UserMerger.new(@user, target_user, current_user).merge! if user = UserMerger.new(@user, target_user, current_user).merge!
render json: success_json.merge(merged: true, user: user) render json: success_json.merge(merged: true, user: user)

5
app/serializers/admin_detailed_user_serializer.rb
View File

@ -18,6 +18,7 @@ class AdminDetailedUserSerializer < AdminUserSerializer
:can_delete_all_posts, :can_delete_all_posts,
:can_be_deleted, :can_be_deleted,
:can_be_anonymized, :can_be_anonymized,
:can_be_merged,
:full_suspend_reason, :full_suspend_reason,
:suspended_till, :suspended_till,
:silence_reason, :silence_reason,
@ -74,6 +75,10 @@ class AdminDetailedUserSerializer < AdminUserSerializer
scope.can_anonymize_user?(object) scope.can_anonymize_user?(object)
end end
def can_be_merged
scope.can_merge_user?(object)
end
def topic_count def topic_count
object.topics.count object.topics.count
end end

8
lib/guardian/user_guardian.rb
View File

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