X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..a71b8af4d1bded364c0ba7f05c8dd851a4a19859:/app/controllers/user_blocks_controller.rb?ds=sidebyside diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 70dfddf83..63fca6557 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -79,11 +79,9 @@ class UserBlocksController < ApplicationController ## # revokes the block, setting the end_time to now def revoke - if params[:confirm] - if @user_block.revoke! current_user - flash[:notice] = t ".flash" - redirect_to(@user_block) - end + if request.post? && params[:confirm] && @user_block.revoke!(current_user) + flash[:notice] = t ".flash" + redirect_to(@user_block) end end @@ -128,7 +126,7 @@ class UserBlocksController < ApplicationController @block_period = params[:user_block_period].to_i @valid_params = false - if !UserBlock::PERIODS.include?(@block_period) + if UserBlock::PERIODS.exclude?(@block_period) flash[:error] = t("user_blocks.filter.block_period") elsif @user_block && !@user_block.active?