diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 4dde6d852..14535f4f5 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -15,7 +15,7 @@ module Admin def edit @user = User.find(params[:id]) @notes = @user.notes.order(created_at: :desc).limit(10).load - set_related_reactions + set_feedback_messages end def show @@ -171,14 +171,10 @@ module Admin Credit.remove_from(org, amount) 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) + def set_feedback_messages + @related_reports = FeedbackMessage.where(id: @user.reporter_feedback_messages.ids) + .or(FeedbackMessage.where(id: @user.affected_feedback_messages.ids)) + .or(FeedbackMessage.where(id: @user.offender_feedback_messages.ids)) .order(created_at: :desc).limit(15) end diff --git a/app/models/feedback_message.rb b/app/models/feedback_message.rb index 1d28c8b26..70d3764d5 100644 --- a/app/models/feedback_message.rb +++ b/app/models/feedback_message.rb @@ -26,4 +26,12 @@ class FeedbackMessage < ApplicationRecord def capitalize_status self.status = status.capitalize if status.present? end + + def user_types(user_id) + types = [] + types << "Affected" if user_id == affected_id + types << "Offender" if user_id == offender_id + types << "Reporter" if user_id == reporter_id + types + end end diff --git a/app/views/admin/users/_reports.html.erb b/app/views/admin/users/_reports.html.erb new file mode 100644 index 000000000..327d6c1c6 --- /dev/null +++ b/app/views/admin/users/_reports.html.erb @@ -0,0 +1,19 @@ +
Nothing to report here! 👀
+ <% end %> +