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

Merge pull request #4247 from BrokenEagle/pool-version-enhancements

Browse Source 
Add pool version enhancements
This commit is contained in:
evazion
2020-01-08 19:34:25 -06:00
committed by GitHub
parent 5a4b24f6a0 ad1e22af0b
commit e119524f20
14 changed files with 204 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

5
app/views/pool_versions/_secondary_links.html.erb Normal file
View File

@@ -0,0 +1,5 @@
<% content_for(:secondary_links) do %>
<%= quick_search_form_for(:name_matches, pool_versions_path, "pools", autocomplete: "pool") %>
<%= subnav_link_to "Listing", pool_versions_path %>
<%= subnav_link_to "Search", search_pool_versions_path %>
<% end %>

39
app/views/pool_versions/diff.html.erb
View File

@@ -2,20 +2,37 @@
<div id="a-diff">
<h1>Pool Version Comparison: <%= @pool_version.name %></h1>
<ul>
<li>
<strong>Posts</strong>:
<%= render "pool_versions/diff", diff: @pool_version.build_diff(@other_version) %>
</li>
<% if @other_version %>
<li><strong>Old Desc</strong>: <%= @other_version.description %></li>
<% end %>
<li><strong>New Desc</strong>: <%= @pool_version.description %></li>
</ul>
<% if @other_version.present? %>
<p>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 %>)</p>
<div>
<h2>Name:</h2>
<p>
<% if @pool_version.name != @other_version.name %>
<del><%= @other_version.name %></del> -> <ins><%= @pool_version.name %></ins>
<% else %>
<%= @pool_version.name %>
<% end %>
</p>
</div>
<div>
<h2>Posts:</h2>
<p><%= render "pool_versions/diff", diff: @pool_version.build_diff(@other_version) %></p>
</div>
<div>
<h2>Description:</h2>
<p>
<% if @pool_version.description != @other_version.description %>
<%= pool_page_diff(@pool_version, @other_version) %>
<% else %>
<i>Unchanged.</i>
<% end %>
</p>
</div>
<% end %>
</div>
</div>
<%= render "pools/secondary_links" %>
<%= render "secondary_links" %>
<% content_for(:page_title) do %>
Pool Version Comparison - <%= @pool_version.name %> - <%= Danbooru.config.app_name %>

2
app/views/pool_versions/index.html.erb
View File

@@ -8,4 +8,4 @@
</div>
</div>
<%= render "pools/secondary_links" %>
<%= render "secondary_links" %>

19
app/views/pool_versions/search.html.erb Normal file
View File

@@ -0,0 +1,19 @@
<div id="c-pool-versions">
<div id="a-search">
<h1>Search Changes</h1>
<%= search_form_for(pool_versions_path) do |f| %>
<%= f.input :updater_name, label: "Updater", input_html: { value: params.dig(:search, :updater_name), "data-autocomplete": "user" } %>
<%= f.input :name_matches, label: "Pool", input_html: { value: params.dig(:search, :name_matches), "data-autocomplete": "pool" } %>
<%= f.input :category, label: "Category", collection: [["Series", "series"], ["Collection", "collection"]], include_blank: true %>
<%= f.input :is_new, label: "New?", collection: [["Yes", true], ["No", false]], include_blank: true %>
<%= f.input :name_changed, label: "Name changed?", collection: [["Yes", true], ["No", false]], include_blank: true %>
<%= f.input :description_changed, label: "Description changed?", collection: [["Yes", true], ["No", false]], include_blank: true %>
<%= f.input :is_active, label: "Active?", collection: [["Yes", true], ["No", false]], include_blank: true %>
<%= f.input :is_banned, label: "Deleted?", collection: [["Yes", true], ["No", false]], include_blank: true %>
<%= f.submit "Search" %>
<% end %>
</div>
</div>
<%= render "secondary_links" %>

5
app/views/wiki_page_versions/diff.html.erb
View File

@@ -7,7 +7,10 @@
<p>Showing differences between <%= compact_time @thispage.updated_at %> (<%= link_to_user @thispage.updater %>) and <%= compact_time @otherpage.updated_at %> (<%= link_to_user @otherpage.updater %>)</p>
<div>
<%= wiki_page_diff(@thispage, @otherpage) %>
<%= wiki_other_names_diff(@thispage, @otherpage) %>
</div>
<div>
<%= wiki_body_diff(@thispage, @otherpage) %>
</div>
<% else %>
<p>The artist requested removal of this page.</p>