From: Tom Hughes Date: Fri, 23 Aug 2024 17:09:21 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/5110' X-Git-Tag: live~692 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ec5754a9bd56dbb802a2897851ebf71deb017f89?hp=dd1c07f609e4ebfb5398e84a007264c4ee8cf66d Merge remote-tracking branch 'upstream/pull/5110' --- diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb index 6baa67be5..7ee75f3bc 100644 --- a/app/abilities/ability.rb +++ b/app/abilities/ability.rb @@ -60,7 +60,7 @@ class Ability can [:index, :show, :resolve, :ignore, :reopen], Issue can :create, IssueComment can [:new, :create, :edit, :update, :destroy], Redaction - can [:new, :create, :revoke, :revoke_all], UserBlock + can [:new, :create, :revoke_all], UserBlock can :update, UserBlock, :creator => user can :update, UserBlock, :revoker => user can :update, UserBlock, :active? => true diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 7027359cc..6bf86de3f 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -10,10 +10,10 @@ class UserBlocksController < ApplicationController authorize_resource before_action :lookup_user, :only => [:new, :create, :revoke_all, :blocks_on, :blocks_by] - before_action :lookup_user_block, :only => [:show, :edit, :update, :revoke] + before_action :lookup_user_block, :only => [:show, :edit, :update] before_action :require_valid_params, :only => [:create, :update] before_action :check_database_readable - before_action :check_database_writable, :only => [:create, :update, :revoke, :revoke_all] + before_action :check_database_writable, :only => [:create, :update, :revoke_all] def index @params = params.permit @@ -105,15 +105,6 @@ class UserBlocksController < ApplicationController end end - ## - # revokes the block, setting the end_time to now - def revoke - if request.post? && params[:confirm] && @user_block.revoke!(current_user) - flash[:notice] = t ".flash" - redirect_to(@user_block) - end - end - ## # revokes all active blocks def revoke_all diff --git a/app/views/user_blocks/_block.html.erb b/app/views/user_blocks/_block.html.erb index b464b4ccd..1eb38f93f 100644 --- a/app/views/user_blocks/_block.html.erb +++ b/app/views/user_blocks/_block.html.erb @@ -16,7 +16,4 @@ <%= link_to t(".show"), block %> <% if can?(:edit, block) %><%= link_to t(".edit"), edit_user_block_path(block) %><% end %> - <% if can?(:revoke, UserBlock) %> - <% if block.active? %><%= link_to t(".revoke"), revoke_user_block_path(block) %><% end %> - <% end %> diff --git a/app/views/user_blocks/_blocks.html.erb b/app/views/user_blocks/_blocks.html.erb index d0c7a8117..de6feafa1 100644 --- a/app/views/user_blocks/_blocks.html.erb +++ b/app/views/user_blocks/_blocks.html.erb @@ -13,9 +13,6 @@ <%= t ".revoker_name" %> - <% if can?(:revoke, UserBlock) %> - - <% end %> <%= render :partial => "block", :collection => @user_blocks %> diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb deleted file mode 100644 index 224e1e4bb..000000000 --- a/app/views/user_blocks/revoke.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -<% @title = t(".title", - :block_on => @user_block.user.display_name, - :block_by => @user_block.creator.display_name) %> - -<% content_for :heading do %> -

<%= t(".heading_html", - :block_on => link_to(@user_block.user.display_name, @user_block.user), - :block_by => link_to(@user_block.creator.display_name, @user_block.creator)) %>

-<% end %> - -<% if @user_block.ends_at > Time.now %> -

- <%= t(".time_future_html", :time => friendly_date(@user_block.ends_at)) %> -

- - <%= bootstrap_form_for :revoke, :url => { :action => "revoke" } do |f| %> -
-
- <%= check_box_tag "confirm", "yes", false, { :class => "form-check-input" } %> - <%= label_tag "confirm", t(".confirm"), { :class => "form-check-label" } %> -
-
- - <%= f.submit t(".revoke"), :class => "btn btn-danger" %> - <% end %> - -<% else %> -

- <%= t(".past_html", :time => friendly_date_ago(@user_block.ends_at)) %> -

-<% end %> diff --git a/app/views/user_blocks/show.html.erb b/app/views/user_blocks/show.html.erb index 06275c3f0..180406c74 100644 --- a/app/views/user_blocks/show.html.erb +++ b/app/views/user_blocks/show.html.erb @@ -26,15 +26,8 @@
<%= @user_block.reason.to_html %>
-<% if current_user && (current_user.id == @user_block.creator_id || - current_user.id == @user_block.revoker_id) || - can?(:revoke, UserBlock) && @user_block.active? %> +<% if can?(:edit, @user_block) %>
- <% if can?(:edit, @user_block) %> - <%= link_to t(".edit"), edit_user_block_path(@user_block), :class => "btn btn-outline-primary" %> - <% end %> - <% if can?(:revoke, UserBlock) && @user_block.active? %> - <%= link_to t(".revoke"), revoke_user_block_path(@user_block), :class => "btn btn-outline-danger" %> - <% end %> + <%= link_to t(".edit"), edit_user_block_path(@user_block), :class => "btn btn-outline-primary" %>
<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 80811cd1f..36698f02c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2958,14 +2958,6 @@ en: title: "User blocks" heading: "List of user blocks" empty: "No blocks have been made yet." - revoke: - title: "Revoking block on %{block_on}" - heading_html: "Revoking block on %{block_on} by %{block_by}" - time_future_html: "This block will end in %{time}." - past_html: "This block ended %{time} and cannot be revoked now." - confirm: "Are you sure you wish to revoke this block?" - revoke: "Revoke!" - flash: "This block has been revoked." revoke_all: title: "Revoking all blocks on %{block_on}" heading_html: "Revoking all blocks on %{block_on}" @@ -3013,7 +3005,6 @@ en: status: "Status:" show: "Show" edit: "Edit" - revoke: "Revoke!" confirm: "Are you sure?" reason: "Reason for block:" revoker: "Revoker:" @@ -3022,7 +3013,6 @@ en: not_revoked: "(not revoked)" show: "Show" edit: "Edit" - revoke: "Revoke!" blocks: display_name: "Blocked User" creator_name: "Creator" diff --git a/config/routes.rb b/config/routes.rb index 125d6f810..b0e23301e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -334,7 +334,6 @@ OpenStreetMap::Application.routes.draw do get "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :as => "user_blocks_by" get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block" resources :user_blocks, :except => :new - match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block" match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks" # issues and reports diff --git a/test/controllers/user_blocks_controller_test.rb b/test/controllers/user_blocks_controller_test.rb index 61440ae56..ed310f52e 100644 --- a/test/controllers/user_blocks_controller_test.rb +++ b/test/controllers/user_blocks_controller_test.rb @@ -33,14 +33,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest { :path => "/user_blocks/1", :method => :delete }, { :controller => "user_blocks", :action => "destroy", :id => "1" } ) - assert_routing( - { :path => "/blocks/1/revoke", :method => :get }, - { :controller => "user_blocks", :action => "revoke", :id => "1" } - ) - assert_routing( - { :path => "/blocks/1/revoke", :method => :post }, - { :controller => "user_blocks", :action => "revoke", :id => "1" } - ) assert_routing( { :path => "/user/username/blocks", :method => :get }, @@ -173,10 +165,10 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest block = create(:user_block, :creator => creator_user) session_for(other_moderator_user) - check_block_buttons block, :edit => 1, :revoke => 1 + check_block_buttons block, :edit => 1 session_for(creator_user) - check_block_buttons block, :edit => 1, :revoke => 1 + check_block_buttons block, :edit => 1 end ## @@ -553,55 +545,6 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest assert_equal other_moderator_user, block.revoker end - ## - # test the revoke action - def test_revoke - active_block = create(:user_block) - - # Check that the block revoke page requires us to login - get revoke_user_block_path(:id => active_block) - assert_redirected_to login_path(:referer => revoke_user_block_path(:id => active_block)) - - # Login as a normal user - session_for(create(:user)) - - # Check that normal users can't load the block revoke page - get revoke_user_block_path(:id => active_block) - assert_redirected_to :controller => "errors", :action => "forbidden" - - # Login as a moderator - session_for(create(:moderator_user)) - - # Check that the block revoke page loads for moderators - get revoke_user_block_path(:id => active_block) - assert_response :success - assert_template "revoke" - assert_select "h1 a[href='#{user_path active_block.user}']", :text => active_block.user.display_name - assert_select "form", :count => 1 do - assert_select "input#confirm[type='checkbox']", :count => 1 - assert_select "input[type='submit'][value='Revoke!']", :count => 1 - end - - # Check that revoking a block using GET should fail - get revoke_user_block_path(:id => active_block, :confirm => true) - assert_response :success - assert_template "revoke" - b = UserBlock.find(active_block.id) - assert_operator b.ends_at - Time.now.utc, :>, 100 - - # Check that revoking a block works using POST - post revoke_user_block_path(:id => active_block, :confirm => true) - assert_redirected_to user_block_path(active_block) - b = UserBlock.find(active_block.id) - assert_in_delta Time.now.utc, b.ends_at, 1 - - # We should get an error if the block doesn't exist - get revoke_user_block_path(:id => 99999) - assert_response :not_found - assert_template "not_found" - assert_select "p", "Sorry, the user block with ID 99999 could not be found." - end - ## # test the revoke all page def test_revoke_all_page @@ -973,12 +916,11 @@ class UserBlocksControllerTest < ActionDispatch::IntegrationTest private - def check_block_buttons(block, edit: 0, revoke: 0) + def check_block_buttons(block, edit: 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 diff --git a/test/integration/user_blocks_test.rb b/test/integration/user_blocks_test.rb index 13db86e28..96717e092 100644 --- a/test/integration/user_blocks_test.rb +++ b/test/integration/user_blocks_test.rb @@ -39,12 +39,13 @@ class UserBlocksTest < ActionDispatch::IntegrationTest # revoke the ban get "/login" assert_response :success - post "/login", :params => { "username" => moderator.email, "password" => "test", :referer => "/blocks/#{block.id}/revoke" } + post "/login", :params => { "username" => moderator.email, "password" => "test", :referer => "/user_blocks/#{block.id}/edit" } assert_response :redirect follow_redirect! assert_response :success - assert_template "user_blocks/revoke" - post "/blocks/#{block.id}/revoke", :params => { "confirm" => "yes" } + assert_template "user_blocks/edit" + put "/user_blocks/#{block.id}", :params => { :user_block_period => "0", + :user_block => { :needs_view => false, :reason => "Unblocked" } } assert_response :redirect follow_redirect! assert_response :success