diff --git a/app/helpers/pool_versions_helper.rb b/app/helpers/pool_versions_helper.rb
deleted file mode 100644
index 4c6fe01e8..000000000
--- a/app/helpers/pool_versions_helper.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-module PoolVersionsHelper
- def pool_versions_listing_type
- params.dig(:search, :pool_id).present? ? :revert : :standard
- end
-
- def pool_version_status_diff(pool_version)
- cur = pool_version
- prev = pool_version.previous
-
- return "New" if prev.blank?
-
- status = []
- status += ["Renamed"] if cur.name != prev.name
- status += ["DescChanged"] if cur.description != prev.description
- status += ["Deleted"] if cur.is_deleted? && !prev.is_deleted?
- status += ["Undeleted"] if !cur.is_deleted? && prev.is_deleted?
- status += ["Activated"] if cur.is_active? && !prev.is_active?
- status += ["Deactivated"] if !cur.is_active? && prev.is_active?
- status.join(" ")
- end
-
- def pool_page_diff(pool_version, other_version)
- pattern = Regexp.new('(?:<.+?>)|(?:\w+)|(?:[ \t]+)|(?:\r?\n)|(?:.+?)')
- DiffBuilder.new(pool_version.description, other_version.description, pattern).build
- end
-end
diff --git a/app/javascript/src/styles/specific/pool_versions.scss b/app/javascript/src/styles/specific/pool_versions.scss
deleted file mode 100644
index 1d7d6c8e7..000000000
--- a/app/javascript/src/styles/specific/pool_versions.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-div#c-pool-versions {
- #a-diff {
- del {
- background: var(--wiki-page-versions-diff-del-background);
- text-decoration: none;
- }
-
- ins {
- background: var(--wiki-page-versions-diff-ins-background);
- text-decoration: none;
- }
-
- span.paragraph-mark {
- opacity: 0.25;
- }
- }
-}
\ No newline at end of file
diff --git a/app/models/pool_archive.rb b/app/models/pool_archive.rb
index 93c080844..f2fe3b031 100644
--- a/app/models/pool_archive.rb
+++ b/app/models/pool_archive.rb
@@ -114,6 +114,37 @@ class PoolArchive < ApplicationRecord
@previous.first
end
+ def self.status_fields
+ {
+ name: "Renamed",
+ description: "Description",
+ was_deleted: "Deleted",
+ was_undeleted: "Undeleted",
+ was_activated: "Activated",
+ was_deactivated: "Deactivated",
+ }
+ end
+
+ def was_deleted
+ is_deleted && !previous.is_deleted
+ end
+
+ def was_undeleted
+ !is_deleted && previous.is_deleted
+ end
+
+ def was_activated
+ is_active && !previous.is_active
+ end
+
+ def was_deactivated
+ !is_active && previous.is_active
+ end
+
+ def text_field_changed
+ previous.present? && (name_changed || description_changed)
+ end
+
def pretty_name
name.tr("_", " ")
end
diff --git a/app/views/pool_versions/_diff.html.erb b/app/views/pool_versions/_diff.html.erb
index 543d8c42a..83e90ec02 100644
--- a/app/views/pool_versions/_diff.html.erb
+++ b/app/views/pool_versions/_diff.html.erb
@@ -11,7 +11,7 @@
<% diff[:removed_post_ids].each do |post_id| %>
<%= link_to post_id, post_path(post_id) %><%#
- %><%= link_to "»", pool_versions_path(search: { post_id: post_id }) %>
-
+ %><%= link_to "»", pool_versions_path(search: { post_id: post_id }) %><%#
+ %>
<% end %>
diff --git a/app/views/pool_versions/_listing.html.erb b/app/views/pool_versions/_listing.html.erb
index 1a4ea0ba0..82462ed36 100644
--- a/app/views/pool_versions/_listing.html.erb
+++ b/app/views/pool_versions/_listing.html.erb
@@ -1,12 +1,12 @@
-
Showing differences between <%= compact_time @pool_version.updated_at %> (<%= link_to_user @pool_version.updater %>) and <%= compact_time @other_version.updated_at %> (<%= link_to_user @other_version.updater %>)
-<% if @pool_version.name != @other_version.name %> @@ -21,11 +21,11 @@
<%= render "pool_versions/diff", diff: @pool_version.build_diff(@other_version) %>
<% if @pool_version.description != @other_version.description %> - <%= pool_page_diff(@pool_version, @other_version) %> + <%= diff_body_html(@pool_version, @other_version, :description) %> <% else %> Unchanged. <% end %>