diff --git a/app/views/post_versions/_listing.html.erb b/app/views/post_versions/_listing.html.erb index 271521616..ee2a86dbd 100644 --- a/app/views/post_versions/_listing.html.erb +++ b/app/views/post_versions/_listing.html.erb @@ -7,18 +7,13 @@ <% end %> - Post - Date - User - Rating - Parent - <% if CurrentUser.is_moderator? %> - IP Address + <% if post_version_listing == :standard %> + Post <% end %> + Version Tags - <% if CurrentUser.is_member? %> - - <% end %> + Updated + @@ -29,24 +24,23 @@ > <% end %> - - <%= link_to("#{post_version.post_id}.#{post_version.id}", post_path(post_version.post_id)) %> - <%= link_to "»", post_versions_path(search: {post_id: post_version.post_id}) %> - - <%= compact_time(post_version.updated_at) %> - - <% if post_version.updater %> - <%= link_to_user(post_version.updater) %> - <% end %> - - <%= post_version.rating %> - <%= post_version.parent_id %> - <% if CurrentUser.is_moderator? %> - - <%= link_to_ip post_version.updater_ip_addr %> - + <% if post_version_listing == :standard %> + <%= PostPresenter.preview(post_version.post, show_deleted: true) %> <% end %> + + <%= link_to "#{post_version.post_id}.#{post_version.version}", post_versions_path(search: { post_id: post_version.post_id }, anchor: "post-version-#{post_version.id}") %> + <%= post_version_diff(post_version) %> + + <%= link_to_user post_version.updater %> + <%= link_to "»", post_versions_path(search: { updater_name: post_version.updater&.name }) %> +
+ <%= compact_time(post_version.updated_at) %> + <% if CurrentUser.is_moderator? %> + (<%= link_to_ip post_version.updater_ip_addr %>) + <% end %> +
+ <% if post_version.can_undo?(CurrentUser.user) %> <%= link_to "Undo", undo_post_version_path(post_version), method: :put, remote: true, class: "post-version-undo-link" %> diff --git a/app/views/post_versions/index.html.erb b/app/views/post_versions/index.html.erb index 3c1afa51e..2526210e3 100644 --- a/app/views/post_versions/index.html.erb +++ b/app/views/post_versions/index.html.erb @@ -1,8 +1,14 @@
-

Changes

+ <% if post_version_listing == :revert %> +

Tag History: <%= link_to "Post ##{params.dig(:search, :post_id)}", @post_versions[0].post %>

+ <%= PostPresenter.preview(@post_versions[0].post, show_deleted: true) %> + <% else %> +

Tag History

+ <% end %> -

Recent updates may not have been processed yet. The most recently processed version was <%= time_ago_in_words_tagged(PostArchive.maximum(:updated_at)) %>.

+ <%= render "posts/partials/common/inline_blacklist" %> +

Recent updates may not have been processed yet. The most recently processed version was <%= time_ago_in_words_tagged(PostArchive.maximum(:updated_at)) %>.

<% if @post_versions.length == 0 %> <%= render "post_sets/blank" %>