X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/58d889436fc05c1a3c32cf6aa28cc751badf99ad..7dbf8d83369cb73929080c4ba23fdd7dcd0184df:/app/views/user_blocks/_block.html.erb?ds=sidebyside
diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index 362cfd107..d91168f54 100644
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -2,10 +2,10 @@
<% c1 = cycle('table0', 'table1') %>
<% if show_user_name %>
-
<%= link_to h(block.user.display_name), :controller => 'user', :action => 'view', :display_name => block.user.display_name %> |
+ <%= link_to h(block.user.display_name), user_path(block.user) %> |
<% end %>
<% if show_creator_name %>
- <%= link_to h(block.creator.display_name), :controller => 'user', :action => 'view', :display_name => block.creator.display_name %> |
+ <%= link_to h(block.creator.display_name), user_path(block.creator) %> |
<% end %>
<%=h truncate(block.reason) %> |
<%=h block_status(block) %> |
@@ -13,11 +13,11 @@
<% if block.revoker_id.nil? %>
<%= t('user_block.partial.not_revoked') %>
<% else %>
- <%= link_to h(block.revoker.display_name), :controller => 'user', :action => 'view', :display_name => block.revoker.display_name %>
+ <%= link_to h(block.revoker.display_name), user_path(block.revoker) %>
<% end %>
<%= link_to t('user_block.partial.show'), block %> |
- <% if @user and @user.id == block.creator_id and block.active? %><%= link_to t('user_block.partial.edit'), edit_user_block_path(block) %><% end %> |
+ <% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t('user_block.partial.edit'), edit_user_block_path(block) %><% end %> |
<% if show_revoke_link %>
<% if block.active? %><%= link_to t('user_block.partial.revoke'), :controller => 'user_blocks', :action => 'revoke', :id => block.id %><% end %> |
<% end %>