From: Anton Khorev <tony29@yandex.ru>
Date: Fri, 23 Aug 2024 10:01:20 +0000 (+0300)
Subject: Remove revoke buttons from block show pages
X-Git-Tag: live~428^2~3
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ed1e5ebe7d1f25e2ac6589c3610e8aae2042e6b0

Remove revoke buttons from block show pages
---

diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb
index 06275c3f0..180406c74 100644
--- a/app/views/user_blocks/show.html.erb
+++ b/app/views/user_blocks/show.html.erb
@@ -26,15 +26,8 @@
   <dd class="col-sm-9"><div class="richtext text-break"><%= @user_block.reason.to_html %></div></dd>
 </dl>
 
-<% if current_user && (current_user.id == @user_block.creator_id ||
-                       current_user.id == @user_block.revoker_id) ||
-      can?(:revoke, UserBlock) && @user_block.active? %>
+<% if can?(:edit, @user_block) %>
   <div>
-    <% if can?(:edit, @user_block) %>
-      <%= 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 %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 26182c3eb..33bb0a292 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3013,7 +3013,6 @@ en:
       status: "Status:"
       show: "Show"
       edit: "Edit"
-      revoke: "Revoke!"
       confirm: "Are you sure?"
       reason: "Reason for block:"
       revoker: "Revoker:"