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

Merge remote-tracking branch 'upstream/pull/5016'

Browse source
This commit is contained in:
Tom Hughes 2024-07-26 17:47:58 +01:00
commit 9e4a240975
5 changed files with 62 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/user_blocks_controller.rb
View file

@ -63,8 +63,9 @@ class UserBlocksController < ApplicationController
def update
if @valid_params
if @user_block.creator != current_user
flash[:error] = t(".only_creator_can_edit")
if current_user != @user_block.creator &&
current_user != @user_block.revoker
flash[:error] = t(@user_block.revoker ? ".only_creator_or_revoker_can_edit" : ".only_creator_can_edit")
redirect_to :action => "edit"
elsif @user_block.update(
:ends_at => Time.now.utc + @block_period.hours,

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? %>

1
config/locales/en.yml
View file

@ -2940,6 +2940,7 @@ en:
flash: "Created a block on user %{name}."
update:
only_creator_can_edit: "Only the moderator who created this block can edit it."
only_creator_or_revoker_can_edit: "Only the moderators who created or revoked this block can edit it."
success: "Block updated."
index:
title: "User blocks"

77
test/controllers/user_blocks_controller_test.rb
View file

@ -212,22 +212,9 @@ 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
def check_block_buttons(block, edit: 0, revoke: 0)
[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
##
# test the new action
def test_new
@ -483,23 +470,32 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
assert_equal "Original Reason", block.reason
session_for(creator_user)
check_block_updates(block)
end
##
# test the update action on revoked blocks
def test_update_revoked
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, :reason => "Original Reason")
session_for(other_moderator_user)
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => false, :reason => "Updated Reason" })
assert_redirected_to user_block_path(block)
assert_equal "Block updated.", flash[:notice]
assert_redirected_to edit_user_block_path(block)
assert_equal "Only the moderators who created or revoked this block can edit it.", flash[:error]
block.reload
assert_not block.active?
assert_equal "Updated Reason", block.reason
assert_not_predicate block, :active?
assert_equal "Original Reason", block.reason
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => true, :reason => "Updated Reason 2" })
assert_redirected_to user_block_path(block)
assert_equal "Block updated.", flash[:notice]
block.reload
assert_predicate block, :active?
assert_equal "Updated Reason 2", block.reason
session_for(creator_user)
check_block_updates(block)
session_for(revoker_user)
check_block_updates(block)
end
##
@ -794,6 +790,35 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest
private
def check_block_buttons(block, edit: 0, revoke: 0)
[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
def check_block_updates(block)
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => false, :reason => "Updated Reason" })
assert_redirected_to user_block_path(block)
assert_equal "Block updated.", flash[:notice]
block.reload
assert_not_predicate block, :active?
assert_equal "Updated Reason", block.reason
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => true, :reason => "Updated Reason 2" })
assert_redirected_to user_block_path(block)
assert_equal "Block updated.", flash[:notice]
block.reload
assert_predicate block, :active?
assert_equal "Updated Reason 2", block.reason
end
def check_user_blocks_table(user_blocks)
assert_dom "table#block_list tbody tr" do |rows|
assert_equal user_blocks.count, rows.count, "unexpected number of rows in user blocks table"