Move more logic to the helper modules
- Diff view changes -- Only show pool description changes in diff view -- Conditionally render diff link when applicable values are changed -- Conditionally show diff view sections when values are changed - Show renames on index view -- There is plenty of space -- This wasn't shown at all for wikis -- Having to navigate to an alternate page is unwieldy for pools - Show "posts" as a status on pools -- This is so all changes among versions are quantified as a status - Standardize diff/index titles
This commit is contained in:
@@ -10,6 +10,11 @@ module ApplicationHelper
|
||||
render "diff_list", diff: diff, ul_class: ul_class, li_class: li_class
|
||||
end
|
||||
|
||||
def diff_name_html(this_name, prev_name)
|
||||
pattern = Regexp.new('.')
|
||||
DiffBuilder.new(this_name, prev_name, pattern).build
|
||||
end
|
||||
|
||||
def diff_body_html(record, previous, field)
|
||||
return h(record[field]).gsub(/\r?\n/, '<span class="paragraph-mark">¶</span><br>').html_safe if previous.blank?
|
||||
|
||||
|
||||
@@ -14,4 +14,24 @@ module ArtistVersionsHelper
|
||||
|
||||
diff_list_html(new_urls, old_urls, latest_urls)
|
||||
end
|
||||
|
||||
def artist_version_name_diff(artist_version)
|
||||
previous = artist_version.previous
|
||||
if previous.present? && (artist_version.name != previous.name)
|
||||
name_diff = diff_name_html(artist_version.name, previous.name)
|
||||
%(<br><br><b>Rename:</b><br> #{name_diff}</p>).html_safe
|
||||
else
|
||||
""
|
||||
end
|
||||
end
|
||||
|
||||
def artist_version_group_name_diff(artist_version)
|
||||
previous = artist_version.previous
|
||||
if artist_version.group_name.present? || (previous.present? && previous.group_name.present?)
|
||||
group_name_diff = diff_name_html(artist_version.group_name, previous.group_name)
|
||||
%(<b>Group:</b><br> #{group_name_diff}<br><br>).html_safe
|
||||
else
|
||||
""
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
31
app/helpers/pool_versions_helper.rb
Normal file
31
app/helpers/pool_versions_helper.rb
Normal file
@@ -0,0 +1,31 @@
|
||||
module PoolVersionsHelper
|
||||
def pool_version_show_diff(pool_version)
|
||||
previous = pool_version.previous
|
||||
previous.present? && pool_version.description != previous.description
|
||||
end
|
||||
|
||||
def pool_version_name_diff(pool_version)
|
||||
previous = pool_version.previous
|
||||
if previous.present? && (pool_version.name != previous.name)
|
||||
name_diff = diff_name_html(pool_version.pretty_name, previous.pretty_name)
|
||||
%(<br><br><b>Rename:</b><br> #{name_diff}</p>).html_safe
|
||||
else
|
||||
""
|
||||
end
|
||||
end
|
||||
|
||||
def pool_version_post_diff(pool_version)
|
||||
previous = pool_version.previous
|
||||
diff = {}
|
||||
|
||||
if previous.present?
|
||||
diff[:added_post_ids] = pool_version.post_ids - previous.post_ids
|
||||
diff[:removed_post_ids] = previous.post_ids - pool_version.post_ids
|
||||
else
|
||||
diff[:added_post_ids] = pool_version.added_post_ids
|
||||
diff[:removed_post_ids] = pool_version.removed_post_ids
|
||||
end
|
||||
|
||||
render "pool_versions/diff", diff: diff
|
||||
end
|
||||
end
|
||||
@@ -1,19 +1,48 @@
|
||||
module PostVersionsHelper
|
||||
def post_version_diff(post_version)
|
||||
diff = post_version.diff(post_version.previous)
|
||||
previous = post_version.previous
|
||||
post = post_version.post
|
||||
|
||||
if post.nil?
|
||||
latest_tags = post_version.tag_array
|
||||
else
|
||||
latest_tags = post.tag_array
|
||||
latest_tags << "rating:#{post.rating}" if post.rating.present?
|
||||
latest_tags << "parent:#{post.parent_id}" if post.parent_id.present?
|
||||
latest_tags << "source:#{post.source}" if post.source.present?
|
||||
end
|
||||
|
||||
new_tags = post_version.tag_array
|
||||
new_tags << "rating:#{post_version.rating}" if post_version.rating.present?
|
||||
new_tags << "parent:#{post_version.parent_id}" if post_version.parent_id.present?
|
||||
new_tags << "source:#{post_version.source}" if post_version.source.present?
|
||||
|
||||
old_tags = previous.present? ? previous.tag_array : []
|
||||
if previous.present?
|
||||
old_tags << "rating:#{previous.rating}" if previous.rating.present?
|
||||
old_tags << "parent:#{previous.parent_id}" if previous.parent_id.present?
|
||||
old_tags << "source:#{previous.source}" if previous.source.present?
|
||||
end
|
||||
|
||||
added_tags = new_tags - old_tags
|
||||
removed_tags = old_tags - new_tags
|
||||
obsolete_added_tags = added_tags - latest_tags,
|
||||
obsolete_removed_tags = removed_tags & latest_tags,
|
||||
unchanged_tags = new_tags & old_tags
|
||||
|
||||
html = '<span class="diff-list">'
|
||||
|
||||
diff[:added_tags].each do |tag|
|
||||
prefix = diff[:obsolete_added_tags].include?(tag) ? '+<ins class="obsolete">' : '<ins>+'
|
||||
added_tags.each do |tag|
|
||||
prefix = obsolete_added_tags.include?(tag) ? '+<ins class="obsolete">' : '<ins>+'
|
||||
html << prefix + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '</ins>'
|
||||
html << " "
|
||||
end
|
||||
diff[:removed_tags].each do |tag|
|
||||
prefix = diff[:obsolete_removed_tags].include?(tag) ? '-<del class="obsolete">' : '<del>-'
|
||||
removed_tags.each do |tag|
|
||||
prefix = obsolete_removed_tags.include?(tag) ? '-<del class="obsolete">' : '<del>-'
|
||||
html << prefix + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '</del>'
|
||||
html << " "
|
||||
end
|
||||
diff[:unchanged_tags].each do |tag|
|
||||
unchanged_tags.each do |tag|
|
||||
html << '<span>' + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '</span>'
|
||||
html << " "
|
||||
end
|
||||
|
||||
@@ -1,9 +1,28 @@
|
||||
module WikiPageVersionsHelper
|
||||
def wiki_other_names_diff(new_version, old_version)
|
||||
def wiki_version_show_diff(wiki_page_version)
|
||||
previous = wiki_page_version.previous
|
||||
previous.present? && ((wiki_page_version.body != previous.body) || wiki_page_version.other_names_changed)
|
||||
end
|
||||
|
||||
def wiki_version_show_other_names(new_version, old_version)
|
||||
((new_version.other_names - old_version.other_names) | (old_version.other_names - new_version.other_names)).length > 0
|
||||
end
|
||||
|
||||
def wiki_version_other_names_diff(new_version, old_version)
|
||||
new_names = new_version.other_names
|
||||
old_names = old_version.other_names
|
||||
latest_names = new_version.wiki_page.other_names
|
||||
|
||||
diff_list_html(new_names, old_names, latest_names, ul_class: ["wiki-other-names-diff-list list-inline"], li_class: ["wiki-other-name"])
|
||||
end
|
||||
|
||||
def wiki_version_title_diff(wiki_page_version)
|
||||
previous = wiki_page_version.previous
|
||||
if previous.present? && (wiki_page_version.title != previous.title)
|
||||
name_diff = diff_name_html(wiki_page_version.title, previous.title)
|
||||
%((<b>Rename:</b> #{name_diff})).html_safe
|
||||
else
|
||||
""
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user