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

[rails.git] / app / views / trace / edit.html.erb

diff --git a/app/views/trace/edit.html.erb b/app/views/trace/edit.html.erb
index 935862af4766ca30e9da188b227d97f56b528950..b2254afddd01a11ed521fdf5343239a5ae9ec87b 100644 (file)
--- a/app/views/trace/edit.html.erb
+++ b/app/views/trace/edit.html.erb
@@ -10,7 +10,7 @@
   <fieldset>
     <div class='form-row'>
       <label class='standard-label'><%= t'trace.edit.filename' %></label>
-      <p class='deemphasize'><%= @trace.name %> (<%= link_to t('trace.edit.download'), :controller => 'trace', :action => 'data', :id => @trace.id %>)</p>
+      <p class='deemphasize'><%= @trace.name %> (<%= link_to t('trace.edit.download'), trace_data_path(@trace) %>)</p>
     </div>
     <div class='form-row'>
       <label class='standard-label'><%= t'trace.edit.uploaded_at' %></label>
@@ -32,7 +32,7 @@
   <% end %>
     <div class='form-row'>
       <label class='standard-label'><%= t'trace.edit.owner' %></label>
-      <p class='deemphasize'><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></p>
+      <p class='deemphasize'><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></p>
     </div>
     <div class='form-row'>
       <label class='standard-label'><%= t'trace.edit.description' %></label>