X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b897832349ad0878e950ed177b7a050efb9a4a7c..48fff2bfeabb9a9bafd78c9cd4a0077e6569b631:/app/controllers/user_blocks_controller.rb?ds=inline diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 4a55c9ba2..63ebdad71 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -3,8 +3,9 @@ class UserBlocksController < ApplicationController before_action :authorize_web before_action :set_locale - before_action :require_user, :only => [:new, :create, :edit, :update, :revoke] - before_action :require_moderator, :only => [:new, :create, :edit, :update, :revoke] + + authorize_resource + before_action :lookup_user, :only => [:new, :create, :blocks_on, :blocks_by] before_action :lookup_user_block, :only => [:show, :edit, :update, :revoke] before_action :require_valid_params, :only => [:create, :update] @@ -31,7 +32,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 @@ -40,12 +41,12 @@ 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] ) if @user_block.save - flash[:notice] = t("user_block.create.flash", :name => @user.display_name) + flash[:notice] = t(".flash", :name => @user.display_name) redirect_to @user_block else render :action => "new" @@ -58,14 +59,14 @@ class UserBlocksController < ApplicationController def update if @valid_params if @user_block.creator != current_user - flash[:error] = t("user_block.update.only_creator_can_edit") + 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] ) - flash[:notice] = t("user_block.update.success") + flash[:notice] = t(".success") redirect_to(@user_block) else render :action => "edit" @@ -78,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 "user_block.revoke.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 @@ -127,11 +126,11 @@ class UserBlocksController < ApplicationController @block_period = params[:user_block_period].to_i @valid_params = false - if !UserBlock::PERIODS.include?(@block_period) - flash[:error] = t("user_block.filter.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_block.filter.block_expired") + flash[:error] = t("user_blocks.filter.block_expired") else @valid_params = true