diff --git a/app/helpers/pool_versions_helper.rb b/app/helpers/pool_versions_helper.rb index c52d6f44c..2e8184feb 100644 --- a/app/helpers/pool_versions_helper.rb +++ b/app/helpers/pool_versions_helper.rb @@ -3,4 +3,19 @@ module PoolVersionsHelper 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 end diff --git a/app/views/pool_versions/_listing.html.erb b/app/views/pool_versions/_listing.html.erb index 389db36de..a4ef76d2e 100644 --- a/app/views/pool_versions/_listing.html.erb +++ b/app/views/pool_versions/_listing.html.erb @@ -1,18 +1,21 @@
<%= table_for @pool_versions, {class: "striped autofit", width: "100%"} do |t| %> + <% t.column th: {width: "3%"} do |pool_version| %> + <%= link_to_if pool_version.previous.present?, "diff", diff_pool_version_path(pool_version.id) %> + <% end %> <% t.column "Pool" do |pool_version| %> <%= link_to pool_version.pretty_name, pool_path(pool_version.pool_id), class: "pool-category-#{pool_version.pool.category}" %> <%= link_to "ยป", pool_versions_path(search: { pool_id: pool_version.pool_id }), class: "pool-category-#{pool_version.pool.category}" %> <% end %> - <% t.column "Changes", td: { class: "col-expand" } do |pool_version| %> + <% t.column "Post Changes", td: { class: "col-expand" } do |pool_version| %> <%= render "pool_versions/diff", diff: pool_version.build_diff %> <% end %> <% t.column "Post Count" do |pool_version| %> <%= link_to pool_version.post_ids.size, pool_versions_path(search: { pool_id: pool_version.pool_id }) %> <% end %> - <% t.column "Desc Chg" do |pool_version| %> - <%= link_to_if pool_version.description_changed, pool_version.description_changed, diff_pool_version_path(pool_version.id) %> + <% t.column "Status", td: {class: "col-expand"} do |pool_version| %> + <%= pool_version_status_diff(pool_version) %> <% end %> <% t.column "Updater" do |pool_version| %> <% if pool_version.updater %>