X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c49e400aa36d116ded8188240961d1e88b172ccd..6cd694431ed325ce2013e9732b640234610271cc:/app/controllers/user_blocks_controller.rb diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 63fca6557..546c8233c 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -1,4 +1,6 @@ class UserBlocksController < ApplicationController + include UserMethods + layout "site" before_action :authorize_web @@ -32,7 +34,7 @@ class UserBlocksController < ApplicationController end def edit - params[:user_block_period] = ((@user_block.ends_at - Time.now.getutc) / 1.hour).ceil.to_s + params[:user_block_period] = ((@user_block.ends_at - Time.now.utc) / 1.hour).ceil.to_s end def create @@ -41,7 +43,7 @@ class UserBlocksController < ApplicationController :user => @user, :creator => current_user, :reason => params[:user_block][:reason], - :ends_at => Time.now.getutc + @block_period.hours, + :ends_at => Time.now.utc + @block_period.hours, :needs_view => params[:user_block][:needs_view] ) @@ -62,7 +64,7 @@ class UserBlocksController < ApplicationController flash[:error] = t(".only_creator_can_edit") redirect_to :action => "edit" elsif @user_block.update( - :ends_at => Time.now.getutc + @block_period.hours, + :ends_at => Time.now.utc + @block_period.hours, :reason => params[:user_block][:reason], :needs_view => params[:user_block][:needs_view] )