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

Show edit links for inactive blocks on block pages

Browse source
This commit is contained in:
Anton Khorev 2024-07-24 04:55:59 +03:00
parent d750cc3e80
commit 6ec1947e90
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -26,13 +26,12 @@
<dd class="col-sm-9"><div class="richtext text-break"><%= @user_block.reason.to_html %></div></dd>
</dl>
<% if @user_block.ends_at > Time.now.getutc && (current_user&.id == @user_block.creator_id ||
can?(:revoke, UserBlock)) %>
<% if current_user&.id == @user_block.creator_id || can?(:revoke, UserBlock) && @user_block.active? %>
<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) %>
<% if can?(:revoke, UserBlock) && @user_block.active? %>
<%= link_to t(".revoke"), revoke_user_block_path(@user_block), :class => "btn btn-outline-danger" %>
<% end %>
</div>

10
test/controllers/user_blocks_controller_test.rb
View file

@ -218,10 +218,12 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
private
def check_block_buttons(block, edit: 0, revoke: 0)
get user_blocks_path
assert_response :success
assert_select "a[href='#{edit_user_block_path block}']", :count => edit
assert_select "a[href='#{revoke_user_block_path block}']", :count => revoke
[user_blocks_path, user_block_path(block)].each do |path|
get path
assert_response :success
assert_select "a[href='#{edit_user_block_path block}']", :count => edit
assert_select "a[href='#{revoke_user_block_path block}']", :count => revoke
end
end
public