Remove revoke buttons from block lists

diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb
index b464b4ccdb3f6ef2d8c609ebe800650bdf6c346a..1eb38f93fc50b285b7a6a66a335de94a5bded882 100644 (file)
--- a/app/views/user_blocks/_block.html.erb
+++ b/app/views/user_blocks/_block.html.erb
@@ -16,7 +16,4 @@
   </td>
   <td><%= link_to t(".show"), block %></td>
   <td><% if can?(:edit, block) %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %></td>
-  <% if can?(:revoke, UserBlock) %>
-  <td><% if block.active? %><%= link_to t(".revoke"), revoke_user_block_path(block) %><% end %></td>
-  <% end %>
 </tr>

diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb
index 8816acb1565a5dfb1a2c9dddb4abbc7f144715b7..7f44b6bc33191feaa0680ce8ccdf87f67565f7d9 100644 (file)
--- a/app/views/user_blocks/_blocks.html.erb
+++ b/app/views/user_blocks/_blocks.html.erb
@@ -13,9 +13,6 @@
         <th><%= t ".revoker_name" %></th>
         <th></th>
         <th></th>
-        <% if can?(:revoke, UserBlock) %>
-        <th></th>
-        <% end %>
       </tr>
     </thead>
     <%= render :partial => "block", :collection => @user_blocks %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 80811cd1ff7e23177d759769e9d96d38666c28a2..26182c3eb9ac674ce92f10b148bb5c1f43dd0a1e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3022,7 +3022,6 @@ en:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
-      revoke: "Revoke!"
     blocks:
       display_name: "Blocked User"
       creator_name: "Creator"