Use user_path links. Fixes #1785

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

diff --git a/app/views/trace/view.html.erb b/app/views/trace/view.html.erb
index 57cc39a089bac7751374b28106a41d94cc4e144f..ef951372fedcba824fa78dd37a4c0f1f87e01e17 100644 (file)
--- a/app/views/trace/view.html.erb
+++ b/app/views/trace/view.html.erb
@@ -30,7 +30,7 @@
   <% end %>
   <tr>
     <td><%= t'trace.view.owner' %></td>
   <% end %>
   <tr>
     <td><%= t'trace.view.owner' %></td>

-    <td><%= link_to h(@trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => @trace.user.display_name} %></td>
+    <td><%= link_to h(@trace.user.display_name), user_path(@trace.user) %></td>

   </tr>
   <tr>
     <td><%= t'trace.view.description' %></td>
   </tr>
   <tr>
     <td><%= t'trace.view.description' %></td>


@@ -54,9 +54,11 @@
 
 <br /><br />
 
 
 <br /><br />
 

-<%= if_user(@trace.user) do %>
+<% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?)%>

   <div class="buttons">
   <div class="buttons">

-    <%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %>
+    <%= if_user(@trace.user) do %>
+      <%= button_to t('trace.view.edit_track'), :controller => 'trace', :action => 'edit', :id => @trace.id %>
+    <% end %>

     <%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %>
   </div>
 <% end %>
     <%= button_to t('trace.view.delete_track'), :controller => 'trace', :action => 'delete', :id => @trace.id %>
   </div>
 <% end %>