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

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

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 619cd6c3f0c58d3fdee045698ca72b59882fd0b2..180406c747863f89701ac8e2e282b57fa1e09358 100644 (file)
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -26,13 +26,8 @@
   <dd class="col-sm-9"><div class="richtext text-break"><%= @user_block.reason.to_html %></div></dd>
 </dl>
 
   <dd class="col-sm-9"><div class="richtext text-break"><%= @user_block.reason.to_html %></div></dd>
 </dl>
 

-<% if current_user&.id == @user_block.creator_id || can?(:revoke, UserBlock) && @user_block.active? %>
+<% if can?(:edit, @user_block) %>

   <div>
   <div>

-    <% if current_user&.id == @user_block.creator_id %>
-      <%= link_to t(".edit"), edit_user_block_path(@user_block), :class => "btn btn-outline-primary" %>
-    <% end %>
-    <% if can?(:revoke, UserBlock) && @user_block.active? %>
-      <%= link_to t(".revoke"), revoke_user_block_path(@user_block), :class => "btn btn-outline-danger" %>
-    <% end %>
+    <%= link_to t(".edit"), edit_user_block_path(@user_block), :class => "btn btn-outline-primary" %>

   </div>
 <% end %>
   </div>
 <% end %>