X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f280dcb2d798b3dfd4aad345a1ab7efa10d8bbe4..abc83298cdc9f63a1956ee5a7d30f75b7c7dec07:/app/views/user_blocks/show.html.erb?ds=sidebyside
diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 7b34d204a..52c099ee4 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -3,17 +3,17 @@
:block_by => @user_block.creator.display_name) %>
<% content_for :heading do %>
-
<%= raw t(".heading",
- :block_on => link_to(h(@user_block.user.display_name),
- user_path(@user_block.user)),
- :block_by => link_to(h(@user_block.creator.display_name),
- user_path(@user_block.creator))) %>
+ <%= t(".heading_html",
+ :block_on => link_to(@user_block.user.display_name,
+ user_path(@user_block.user)),
+ :block_by => link_to(@user_block.creator.display_name,
+ user_path(@user_block.creator))) %>
<% if @user_block.ends_at > Time.now.getutc %>
<% if current_user and current_user.id == @user_block.creator_id %>
- <%= link_to t(".edit"), edit_user_block_path(@user_block) %>
<% end %>
- <% if current_user and current_user.moderator? %>
+ <% if can?(:revoke, UserBlock) %>
- <%= link_to(t(".revoke"), :controller => "user_blocks", :action => "revoke", :id => @user_block.id) %>
<% end %>
<% end %>
@@ -24,7 +24,7 @@
<% if @user_block.revoker %>
<%= t ".revoker" %>
- <%= link_to h(@user_block.revoker.display_name), user_path(@user_block.revoker) %>
+ <%= link_to @user_block.revoker.display_name, user_path(@user_block.revoker) %>
<% end %>
@@ -33,4 +33,4 @@
<%= t ".status" %>: <%= block_status(@user_block) %>
<%= t ".reason" %>
-<%= @user_block.reason.to_html %>
+<%= @user_block.reason.to_html %>