From 964a073ec330408750a030b9f2a89f312a3afcb3 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 8 Sep 2019 23:28:02 -0500
Subject: [PATCH] Fix #4159: Add pool history to post show pages.

---
 app/models/pool_archive.rb             | 17 +++++++----------
 app/views/pool_versions/index.html.erb |  2 +-
 app/views/posts/show.html.erb          |  1 +
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/models/pool_archive.rb b/app/models/pool_archive.rb
index ef30ca77d..19c816cdf 100644
--- a/app/models/pool_archive.rb
+++ b/app/models/pool_archive.rb
@@ -18,19 +18,16 @@ class PoolArchive < ApplicationRecord
       where("updater_id = ?", user_id)
     end
 
+    def for_post_id(post_id)
+      where_array_includes(:added_post_ids, [post_id]).or(where_array_includes(:removed_post_ids, [post_id]))
+    end
+
     def search(params)
       q = super
+      q = q.search_attributes(params, :pool_id, :post_ids, :added_post_ids, :removed_post_ids, :updater, :description, :description_changed, :name, :name_changed, :version, :is_active, :is_deleted, :category)
 
-      if params[:updater_id].present?
-        q = q.where(updater_id: params[:updater_id].split(",").map(&:to_i))
-      end
-
-      if params[:updater_name].present?
-        q = q.where("updater_id = ?", User.name_to_id(params[:updater_name]))
-      end
-
-      if params[:pool_id].present?
-        q = q.where(pool_id: params[:pool_id].split(",").map(&:to_i))
+      if params[:post_id]
+        q = q.for_post_id(params[:post_id].to_i)
       end
 
       q.apply_default_order(params)
diff --git a/app/views/pool_versions/index.html.erb b/app/views/pool_versions/index.html.erb
index f0d30f871..d44477f78 100644
--- a/app/views/pool_versions/index.html.erb
+++ b/app/views/pool_versions/index.html.erb
@@ -2,7 +2,7 @@
   <div id="a-index">
     <h1>Pool History</h1>
 
-    <% if params.dig(:search, :pool_id).present? %>
+    <% if params.dig(:search, :pool_id).present? || params.dig(:search, :post_id).present? %>
       <%= render "revert_listing" %>
     <% else %>
       <%= render "standard_listing" %>
diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb
index a7c1b46f0..53fc69370 100644
--- a/app/views/posts/show.html.erb
+++ b/app/views/posts/show.html.erb
@@ -28,6 +28,7 @@
         <h1>History</h1>
         <ul>
           <li><%= link_to "Tags", post_versions_path(search: { post_id: @post.id }) %></li>
+          <li><%= link_to "Pools", pool_versions_path(search: { post_id: @post.id }) %></li>
           <li><%= link_to "Notes", note_versions_path(search: { post_id: @post.id }) %></li>
           <li><%= link_to "Moderation", post_events_path(@post.id) %></li>
           <li><%= link_to "Commentary", artist_commentary_versions_path(search: { post_id: @post.id }) %></li>