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

[rails.git] / app / controllers / user_blocks_controller.rb

diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb
index 70dfddf83385cf40a7dd7f6994321c0f4d217f8d..63fca655750830184e5a0d221326b050426e5fce 100644 (file)
--- 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
   ##
   # 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
 
     end
   end
 


@@ -128,7 +126,7 @@ class UserBlocksController < ApplicationController
     @block_period = params[:user_block_period].to_i
     @valid_params = false
 
     @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?
       flash[:error] = t("user_blocks.filter.block_period")
 
     elsif @user_block && !@user_block.active?