diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 0e20af8e9..19f5ceb85 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -15,6 +15,7 @@ module Admin
def edit
@user = User.find(params[:id])
@notes = @user.notes.order(created_at: :desc).limit(10).load
+ set_related_reactions
end
def show
@@ -170,6 +171,17 @@ 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)
+ .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/_activity.erb b/app/views/admin/users/_activity.erb
deleted file mode 100644
index 728bdf5ae..000000000
--- a/app/views/admin/users/_activity.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
Activity
-
- - <%= @user.comments_count %> comments
- - <%= @user.articles_count %> articles
- - <%= @user.reactions_count %> reactions
- - <%= @user.followers_count %> followers
- - <%= @user.following_users_count %> users following
- - <%= @user.badge_achievements_count %> badges
-
-
-
-
Current Roles
-
(view full history in notes below)
-
- <% @user.roles.each do |role| %>
- - <%= role.name %> <%= "- " + Tag.find(role.resource_id).name if role.resource_id.present? %>
- <% end %>
-
-
-
-
diff --git a/app/views/admin/users/_activity.html.erb b/app/views/admin/users/_activity.html.erb
new file mode 100644
index 000000000..a3ce5b75f
--- /dev/null
+++ b/app/views/admin/users/_activity.html.erb
@@ -0,0 +1,22 @@
+
+
+
Activity
+
+ - <%= @user.comments_count %> comments
+ - <%= @user.articles_count %> articles
+ - <%= @user.reactions_count %> reactions
+ - <%= @user.followers_count %> followers
+ - <%= @user.following_users_count %> users following
+ - <%= @user.badge_achievements_count %> badges
+
+
+
+
Current Roles
+
(view full history in notes below)
+
+ <% @user.roles.each do |role| %>
+ - <%= role.name %> <%= "- #{Tag.find(role.resource_id).name}" if role.resource_id.present? %>
+ <% end %>
+
+
+
diff --git a/app/views/admin/users/_credits.erb b/app/views/admin/users/_credits.html.erb
similarity index 100%
rename from app/views/admin/users/_credits.erb
rename to app/views/admin/users/_credits.html.erb
diff --git a/app/views/admin/users/_negative_reactions.html.erb b/app/views/admin/users/_negative_reactions.html.erb
new file mode 100644
index 000000000..01399504b
--- /dev/null
+++ b/app/views/admin/users/_negative_reactions.html.erb
@@ -0,0 +1,21 @@
+
+
+
Recent Reactions
+
+
+
+
diff --git a/app/views/admin/users/_notes.erb b/app/views/admin/users/_notes.html.erb
similarity index 100%
rename from app/views/admin/users/_notes.erb
rename to app/views/admin/users/_notes.html.erb
diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb
index 8d247f63e..5956f2890 100644
--- a/app/views/admin/users/edit.html.erb
+++ b/app/views/admin/users/edit.html.erb
@@ -9,7 +9,7 @@
<%= link_to "Unlock access", unlock_access_admin_user_path(@user), method: :patch, class: "btn btn-success" %>
<% end %>
- admin Profile
+ Admin Profile
Member since <%= @user.created_at.strftime("%b %e '%y") %>
@@ -47,7 +47,8 @@
<% end %>
- <%= render "notes" %>
+<%= render "notes" %>
+<%= render "negative_reactions" %>
diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb
index 77a63c744..062413d4d 100644
--- a/app/views/admin/users/show.html.erb
+++ b/app/views/admin/users/show.html.erb
@@ -35,10 +35,8 @@
- <%= render "activity" %>
- <%= render "credits" %>
- <%= render "notes" %>
- <%= render "user_organizations" %>
- <%= render "email_tools" %>
-
-
+<%= render "activity" %>
+<%= render "credits" %>
+<%= render "notes" %>
+<%= render "user_organizations" %>
+<%= render "email_tools" %>