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 06275c3f0f94c255b8250351415f8f7bdec6483e..180406c747863f89701ac8e2e282b57fa1e09358 100644 (file)
--- 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>
 
   <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>
   <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 %>
   </div>
 <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 26182c3eb9ac674ce92f10b148bb5c1f43dd0a1e..33bb0a292a48e79283b57f43263adc1340a445af 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3013,7 +3013,6 @@ en:
       status: "Status:"
       show: "Show"
       edit: "Edit"
       status: "Status:"
       show: "Show"
       edit: "Edit"

-      revoke: "Revoke!"

       confirm: "Are you sure?"
       reason: "Reason for block:"
       revoker: "Revoker:"
       confirm: "Are you sure?"
       reason: "Reason for block:"
       revoker: "Revoker:"