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

[rails.git] / app / views / user_blocks / _block.html.erb

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index 49619a9c1c03cf7bd16d9175621417a45f2d2be5..50fe74e4cdf4616776bdea979c5008097cd15842 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -1,9 +1,9 @@
 <tr>
   <% if show_user_name %>
-  <td><%= link_to h(block.user.display_name), user_path(block.user) %></td>
+  <td><%= link_to block.user.display_name, block.user %></td>
   <% end %>
   <% if show_creator_name %>
-  <td><%= link_to h(block.creator.display_name), user_path(block.creator) %></td>
+  <td><%= link_to block.creator.display_name, block.creator %></td>
   <% end %>
   <td><%= h truncate(block.reason) %></td>
   <td><%= h block_status(block) %></td>
@@ -11,12 +11,12 @@
     <% if block.revoker_id.nil? %>
       <%= t(".not_revoked") %>
     <% else %>
-      <%= link_to h(block.revoker.display_name), user_path(block.revoker) %>
+      <%= link_to block.revoker.display_name, block.revoker %>
     <% end %>
   </td>
   <td><%= link_to t(".show"), block %></td>
   <td><% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %></td>
   <% if show_revoke_link %>
-  <td><% if block.active? %><%= link_to t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => block.id %><% end %></td>
+  <td><% if block.active? %><%= link_to t(".revoke"), revoke_user_block_path(block) %><% end %></td>
   <% end %>
 </tr>