jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change Desc Chg column to status column

Browse Source 
- Add a diff column
- Reword post column name for better clarity
This commit is contained in:
BrokenEagle
2020-01-06 22:05:27 +00:00
parent ca015a6685
commit 8531636330
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/helpers/pool_versions_helper.rb
View File

@@ -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

9
app/views/pool_versions/_listing.html.erb
View File

@@ -1,18 +1,21 @@
<div id="p-<%= pool_versions_listing_type %>-listing">
<%= 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 %>