X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/783b5e3729228908d7404ae7404af1023501a906..0b7435ab32b3271ae000894f6798cc087b3c058c:/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 ec04c79b7..50fe74e4c 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -1,24 +1,22 @@ - <% c1 = cycle("table0", "table1") %> - <% if show_user_name %> - <%= link_to h(block.user.display_name), user_path(block.user) %> + <%= link_to block.user.display_name, block.user %> <% end %> <% if show_creator_name %> - <%= link_to h(block.creator.display_name), user_path(block.creator) %> + <%= link_to block.creator.display_name, block.creator %> <% end %> - <%= h truncate(block.reason) %> - <%= h block_status(block) %> - + <%= h truncate(block.reason) %> + <%= h block_status(block) %> + <% 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 %> - <%= link_to t(".show"), block %> - <% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %> + <%= link_to t(".show"), block %> + <% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %> <% if show_revoke_link %> - <% if block.active? %><%= link_to t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => block.id %><% end %> + <% if block.active? %><%= link_to t(".revoke"), revoke_user_block_path(block) %><% end %> <% end %>