Merge remote-tracking branch 'upstream/pull/5375'

[rails.git] / app / views / browse / feature.html.erb

diff --git a/app/views/browse/feature.html.erb b/app/views/browse/feature.html.erb
index cd333d3bfd1dbbcd1e301158274b40dfb7de3844..29f911f799302c703aafd6d66a90116032177d18 100644 (file)
--- a/app/views/browse/feature.html.erb
+++ b/app/views/browse/feature.html.erb
@@ -2,7 +2,7 @@
 
 <%= render "sidebar_header", :title => t("browse.#{@type}.title_html", :name => printable_element_name(@feature)) %>
 
 
 <%= render "sidebar_header", :title => t("browse.#{@type}.title_html", :name => printable_element_name(@feature)) %>
 

-<%= render :partial => @type, :object => @feature %>
+<%= render :partial => "browse/#{@type}", :object => @feature %>

 
 <% if @feature.visible? %>
   <div class='secondary-actions'>
 
 <% if @feature.visible? %>
   <div class='secondary-actions'>


@@ -17,7 +17,11 @@
     <% end %>
     &middot;
   <% end %>
     <% end %>
     &middot;
   <% end %>

-    <%= link_to t("browse.view_history"), :action => "#{@type}_history" %>
+    <%= link_to t("browse.view_history"), :controller => "old_#{@type.pluralize}" %>
+  <% if current_user&.moderator? %>
+    &middot;
+    <%= link_to(t("browse.view_unredacted_history"), :controller => "old_#{@type.pluralize}", :params => { :show_redactions => true }) %>
+  <% end %>

   <% if @feature.version > 1 %>
     &middot;
     <%= link_to({ :controller => "old_#{@type.pluralize}", :action => :show, :version => @feature.version }, :class => "icon-link") do %>
   <% if @feature.version > 1 %>
     &middot;
     <%= link_to({ :controller => "old_#{@type.pluralize}", :action => :show, :version => @feature.version }, :class => "icon-link") do %>