diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 146a0aecb..e5e12066e 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -16,6 +16,7 @@ module Admin @user = User.find(params[:id]) @notes = @user.notes.order(created_at: :desc).limit(10).load set_feedback_messages + set_related_reactions end def show @@ -136,6 +137,17 @@ module Admin .order(created_at: :desc).limit(15) end + def set_related_reactions + user_article_ids = @user.articles.ids + user_comment_ids = @user.comments.ids + @related_vomit_reactions = Reaction.where(reactable_type: "Comment", reactable_id: user_comment_ids, + category: "vomit") + .or(Reaction.where(reactable_type: "Article", reactable_id: user_article_ids, category: "vomit")) + .or(Reaction.where(reactable_type: "User", user_id: @user.id, category: "vomit")) + .includes(:reactable) + .order(created_at: :desc).limit(15) + end + def user_params allowed_params = %i[ new_note note_for_current_role user_status diff --git a/app/views/admin/users/_reports.html.erb b/app/views/admin/users/_reports.html.erb index 327d6c1c6..ecc271e3c 100644 --- a/app/views/admin/users/_reports.html.erb +++ b/app/views/admin/users/_reports.html.erb @@ -1,9 +1,9 @@