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 9ee9f807fb1899f395b2bd0fd9529209bd6ee050..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,10 +17,10 @@
     <% 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;
   <% if current_user&.moderator? %>
     &middot;

-    <%= link_to(t("browse.view_unredacted_history"), :action => "#{@type}_history", :params => { :show_redactions => true }) %>
+    <%= link_to(t("browse.view_unredacted_history"), :controller => "old_#{@type.pluralize}", :params => { :show_redactions => true }) %>

   <% end %>
   <% if @feature.version > 1 %>
     &middot;
   <% end %>
   <% if @feature.version > 1 %>
     &middot;