cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show edit links for revoked blocks to revokers

Browse source
This commit is contained in:
Anton Khorev 2024-07-25 04:05:31 +03:00
parent 58ac035d41
commit d88cb014cb
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/user_blocks/_block.html.erb
View file

@ -15,7 +15,8 @@
<% end %>
</td>
<td><%= link_to t(".show"), block %></td>
<td><% if current_user and current_user.id == block.creator_id %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %></td>
<td><% if current_user && (current_user.id == block.creator_id ||
current_user.id == block.revoker_id) %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %></td>
<% if show_revoke_link %>
<td><% if block.active? %><%= link_to t(".revoke"), revoke_user_block_path(block) %><% end %></td>
<% end %>

7
app/views/user_blocks/show.html.erb
View file

@ -26,9 +26,12 @@
<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 current_user && (current_user.id == @user_block.creator_id ||
current_user.id == @user_block.revoker_id) ||
can?(:revoke, UserBlock) && @user_block.active? %>
<div>
<% if current_user&.id == @user_block.creator_id %>
<% if current_user && (current_user.id == @user_block.creator_id ||
current_user.id == @user_block.revoker_id) %>
<%= link_to t(".edit"), edit_user_block_path(@user_block), :class => "btn btn-outline-primary" %>
<% end %>
<% if can?(:revoke, UserBlock) && @user_block.active? %>

2
test/controllers/user_blocks_controller_test.rb
View file

@ -212,7 +212,7 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
check_block_buttons block, :edit => 1
session_for(revoker_user)
check_block_buttons block
check_block_buttons block, :edit => 1
end
private