From 609a440d1cb7dae4a265e6a6986a239a68d2aa0a Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sat, 28 Sep 2019 12:53:45 -0500
Subject: [PATCH] /post_versions: unify standard and revert listings.

---
 app/helpers/post_versions_helper.rb           |  4 ++
 ...ard_listing.html.erb => _listing.html.erb} |  5 +-
 .../post_versions/_revert_listing.html.erb    | 60 -------------------
 app/views/post_versions/index.html.erb        |  7 +--
 4 files changed, 9 insertions(+), 67 deletions(-)
 rename app/views/post_versions/{_standard_listing.html.erb => _listing.html.erb} (87%)
 delete mode 100644 app/views/post_versions/_revert_listing.html.erb

diff --git a/app/helpers/post_versions_helper.rb b/app/helpers/post_versions_helper.rb
index 062deebf4..685ca16aa 100644
--- a/app/helpers/post_versions_helper.rb
+++ b/app/helpers/post_versions_helper.rb
@@ -1,4 +1,8 @@
 module PostVersionsHelper
+  def post_version_listing
+    params.dig(:search, :post_id).present? ? :revert : :standard
+  end
+
   def post_version_diff(post_version)
     diff = post_version.diff(post_version.previous)
     html = '<span class="diff-list">'
diff --git a/app/views/post_versions/_standard_listing.html.erb b/app/views/post_versions/_listing.html.erb
similarity index 87%
rename from app/views/post_versions/_standard_listing.html.erb
rename to app/views/post_versions/_listing.html.erb
index cb188e718..271521616 100644
--- a/app/views/post_versions/_standard_listing.html.erb
+++ b/app/views/post_versions/_listing.html.erb
@@ -1,4 +1,4 @@
-<div id="p-standard-listing">
+<div id="p-<%= post_version_listing %>-listing">
   <table class="striped autofit">
     <thead>
       <tr>
@@ -51,6 +51,9 @@
             <% if post_version.can_undo?(CurrentUser.user) %>
               <%= link_to "Undo", undo_post_version_path(post_version), method: :put, remote: true, class: "post-version-undo-link" %>
             <% end %>
+            <% if post_version_listing == :revert && post_version.can_revert_to?(CurrentUser.user) %>
+              | <%= link_to "Revert to", revert_post_path(post_version.post_id, version_id: post_version.id), method: :put, remote: true %>
+            <% end %>
           </td>
         </tr>
       <% end %>
diff --git a/app/views/post_versions/_revert_listing.html.erb b/app/views/post_versions/_revert_listing.html.erb
deleted file mode 100644
index 55ff0d624..000000000
--- a/app/views/post_versions/_revert_listing.html.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-<div id="p-revert-listing">
-  <table class="striped autofit">
-    <thead>
-      <tr>
-        <% if CurrentUser.user.is_builder? %>
-          <th class="post-version-select-column">
-            <label><input type="checkbox" id="post-version-select-all-checkbox" class="post-version-select-checkbox"></label>
-          </th>
-        <% end %>
-        <th width="5%">Post</th>
-        <th width="15%">Date</th>
-        <th width="10%">User</th>
-        <th width="5%">Rating</th>
-        <th width="5%">Parent</th>
-        <% if CurrentUser.is_moderator? %>
-          <th width="10%">IP Address</th>
-        <% end %>
-        <th>Tags</th>
-        <% if CurrentUser.is_member? %>
-          <th width="7%"></th>
-        <% end %>
-      </tr>
-    </thead>
-    <tbody>
-      <% @post_versions.each do |post_version| %>
-        <tr id="post-version-<%= post_version.id %>" data-post-version-id="<%= post_version.id %>">
-          <% if CurrentUser.user.is_builder? %>
-            <td class="post-version-select-column">
-              <input type="checkbox" class="post-version-select-checkbox" <%= "disabled" unless post_version.can_undo?(CurrentUser.user) %>>
-            </td>
-          <% end %>
-          <td><%= link_to("#{post_version.post_id}.#{post_version.id}", post_path(post_version.post_id)) %></td>
-          <td><%= compact_time(post_version.updated_at) %></td>
-          <td>
-            <% if post_version.updater %>
-              <%= link_to_user(post_version.updater) %>
-            <% end %>
-          </td>
-          <td><%= post_version.rating %></td>
-          <td><%= post_version.parent_id %></td>
-          <% if CurrentUser.is_moderator? %>
-            <td>
-              <%= link_to_ip post_version.updater_ip_addr %>
-            </td>
-          <% end %>
-          <td class="col-expand"><%= post_version_diff(post_version) %></td>
-          <td>
-            <% if post_version.can_undo?(CurrentUser.user) %>
-              <%= link_to "Undo", undo_post_version_path(post_version), method: :put, remote: true, class: "post-version-undo-link" %> |
-            <% end %>
-            <% if post_version.can_revert_to?(CurrentUser.user) %>
-              <%= link_to "Revert to", revert_post_path(post_version.post_id, version_id: post_version.id), method: :put, remote: true %>
-            <% end %>
-          </td>
-        </tr>
-      <% end %>
-    </tbody>
-  </table>
-</div>
-
diff --git a/app/views/post_versions/index.html.erb b/app/views/post_versions/index.html.erb
index bda714bc5..3c1afa51e 100644
--- a/app/views/post_versions/index.html.erb
+++ b/app/views/post_versions/index.html.erb
@@ -7,12 +7,7 @@
     <% if @post_versions.length == 0 %>
       <%= render "post_sets/blank" %>
     <% else %>
-      <% if params.dig(:search, :post_id).present? %>
-        <%= render "revert_listing" %>
-      <% else %>
-        <%= render "standard_listing" %>
-      <% end %>
-
+      <%= render "listing" %>
       <%= numbered_paginator(@post_versions) %>
     <% end %>
   </div>