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

Show edit links for inactive blocks in block lists

Browse source
This commit is contained in:
Anton Khorev 2024-07-24 04:44:59 +03:00
parent 51708d6238
commit d750cc3e80
2 changed files with 58 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@
<% end %>
</td>
<td><%= link_to t(".show"), block %></td>
<td><% if current_user and current_user.id == block.creator_id and block.active? %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %></td>
<td><% if current_user and current_user.id == block.creator_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 %>

57
test/controllers/user_blocks_controller_test.rb
View file

@ -169,6 +169,63 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
assert_not UserBlock.find(active_block.id).needs_view
end
##
# test edit/revoke link for active blocks
def test_active_block_buttons
creator_user = create(:moderator_user)
other_moderator_user = create(:moderator_user)
block = create(:user_block, :creator => creator_user)
session_for(other_moderator_user)
check_block_buttons block, :revoke => 1
session_for(creator_user)
check_block_buttons block, :edit => 1, :revoke => 1
end
##
# test the edit link for expired blocks
def test_expired_block_buttons
creator_user = create(:moderator_user)
other_moderator_user = create(:moderator_user)
block = create(:user_block, :expired, :creator => creator_user)
session_for(other_moderator_user)
check_block_buttons block
session_for(creator_user)
check_block_buttons block, :edit => 1
end
##
# test the edit link for revoked blocks
def test_revoked_block_buttons
creator_user = create(:moderator_user)
revoker_user = create(:moderator_user)
other_moderator_user = create(:moderator_user)
block = create(:user_block, :revoked, :creator => creator_user, :revoker => revoker_user)
session_for(other_moderator_user)
check_block_buttons block
session_for(creator_user)
check_block_buttons block, :edit => 1
session_for(revoker_user)
check_block_buttons block
end
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
end
public
##
# test the new action
def test_new