From ed5caba71ca6f2aea2b21c6bda3ba41b45665986 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 12 Jan 2020 15:48:28 -0600
Subject: [PATCH] /wiki_page_versions: merge page and global listings.

---
 app/helpers/wiki_page_versions_helper.rb      |  4 +++
 .../_global_listing.html.erb                  | 25 -----------------
 ...age_listing.html.erb => _listing.html.erb} | 28 ++++++++++---------
 app/views/wiki_page_versions/index.html.erb   |  6 +---
 4 files changed, 20 insertions(+), 43 deletions(-)
 delete mode 100644 app/views/wiki_page_versions/_global_listing.html.erb
 rename app/views/wiki_page_versions/{_page_listing.html.erb => _listing.html.erb} (56%)

diff --git a/app/helpers/wiki_page_versions_helper.rb b/app/helpers/wiki_page_versions_helper.rb
index 6b5dc94f9..88a4b110d 100644
--- a/app/helpers/wiki_page_versions_helper.rb
+++ b/app/helpers/wiki_page_versions_helper.rb
@@ -1,4 +1,8 @@
 module WikiPageVersionsHelper
+  def wiki_page_versions_listing_type
+    params.dig(:search, :wiki_page_id).present? ? :page : :global
+  end
+
   def wiki_page_version_status_diff(wiki_page_version)
     cur = wiki_page_version
     prev = wiki_page_version.previous
diff --git a/app/views/wiki_page_versions/_global_listing.html.erb b/app/views/wiki_page_versions/_global_listing.html.erb
deleted file mode 100644
index eb8bbab59..000000000
--- a/app/views/wiki_page_versions/_global_listing.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<div id="p-global-listing">
-
-  <%= table_for @wiki_page_versions, width: "100%" do |t| %>
-    <% t.column width: "3%" do |wiki_page_version| %>
-      <%= link_to_if wiki_page_version.previous.present?, "diff", diff_wiki_page_versions_path(otherpage: wiki_page_version.previous.try(:id), thispage: wiki_page_version.id) %>
-    <% end %>
-    <% t.column "Title" do |wiki_page_version| %>
-      <span class="category-<%= wiki_page_version.category_name %>">
-        <%= link_to "?", wiki_page_path(wiki_page_version.wiki_page_id) %>
-        <%= link_to wiki_page_version.title, wiki_page_version %>
-        <%= link_to "»", wiki_page_versions_path(search: { wiki_page_id: wiki_page_version.wiki_page_id }) %>
-      </span>
-    <% end %>
-    <% t.column "Status", {width: "5%"} do |wiki_page_version| %>
-      <%= wiki_page_version_status_diff(wiki_page_version) %>
-    <% end %>
-    <% t.column "Last edited", {width: "26%"} do |wiki_page_version| %>
-      <%= compact_time(wiki_page_version.updated_at) %>
-      by
-      <%= link_to_user wiki_page_version.updater %>
-      <%= link_to "»", wiki_page_versions_path(search: { updater_id: wiki_page_version.updater.id }) %>
-    <% end %>
-  <% end %>
-
-</div>
diff --git a/app/views/wiki_page_versions/_page_listing.html.erb b/app/views/wiki_page_versions/_listing.html.erb
similarity index 56%
rename from app/views/wiki_page_versions/_page_listing.html.erb
rename to app/views/wiki_page_versions/_listing.html.erb
index d6cdca475..649e25e00 100644
--- a/app/views/wiki_page_versions/_page_listing.html.erb
+++ b/app/views/wiki_page_versions/_listing.html.erb
@@ -1,24 +1,24 @@
-<div id="p-page-listing">
+<div id="p-<%= wiki_page_versions_listing_type %>-listing">
   <%= form_tag(diff_wiki_page_versions_path, :method => :get) do %>
-
     <%= table_for @wiki_page_versions, width: "100%" do |t| %>
       <% t.column width: "3%" do |wiki_page_version, i| %>
-        <% if i < @wiki_page_versions.length - 1 %>
-          <%= link_to "diff", diff_wiki_page_versions_path(:otherpage => wiki_page_version.id, :thispage => @wiki_page_versions[i + 1].id) %>
-        <% else %>
-          diff
+        <%= link_to_if wiki_page_version.previous.present?, "diff", diff_wiki_page_versions_path(otherpage: wiki_page_version.previous.try(:id), thispage: wiki_page_version.id) %>
+      <% end %>
+
+      <% if wiki_page_versions_listing_type == :page %>
+        <% t.column width: "2%" do |wiki_page_version, i| %>
+          <%= radio_button_tag "thispage", wiki_page_version.id, (i == 1) %>
+        <% end %>
+        <% t.column width: "2%" do |wiki_page_version, i| %>
+          <%= radio_button_tag "otherpage", wiki_page_version.id, (i == 0) %>
         <% end %>
       <% end %>
-      <% t.column width: "2%" do |wiki_page_version, i| %>
-        <%= radio_button_tag "thispage", wiki_page_version.id, (i == 1) %>
-      <% end %>
-      <% t.column width: "2%" do |wiki_page_version, i| %>
-        <%= radio_button_tag "otherpage", wiki_page_version.id, (i == 0) %>
-      <% end %>
+
       <% t.column "Title" do |wiki_page_version| %>
         <span class="category-<%= wiki_page_version.category_name %>">
           <%= link_to "?", wiki_page_path(wiki_page_version.wiki_page_id) %>
           <%= link_to wiki_page_version.title, wiki_page_version %>
+          <%= link_to "»", wiki_page_versions_path(search: { wiki_page_id: wiki_page_version.wiki_page_id }) %>
         </span>
       <% end %>
       <% t.column "Status", {width: "5%"} do |wiki_page_version| %>
@@ -32,6 +32,8 @@
       <% end %>
     <% end %>
 
-    <%= submit_tag "Diff" %>
+    <% if wiki_page_versions_listing_type == :page %>
+      <%= submit_tag "Diff" %>
+    <% end %>
   <% end %>
 </div>
diff --git a/app/views/wiki_page_versions/index.html.erb b/app/views/wiki_page_versions/index.html.erb
index 57dc219d1..33613d14f 100644
--- a/app/views/wiki_page_versions/index.html.erb
+++ b/app/views/wiki_page_versions/index.html.erb
@@ -3,11 +3,7 @@
 <% content_for(:content) do %>
   <h1>Wiki Page History</h1>
 
-  <% if params.dig(:search, :wiki_page_id).present? %>
-    <%= render "page_listing" %>
-  <% else %>
-    <%= render "global_listing" %>
-  <% end %>
+  <%= render "listing" %>
 
   <%= numbered_paginator(@wiki_page_versions) %>
 <% end %>