X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/daa2496024cf0bdc65e58eb6e2802784f411f68b..e37a9ec0b52ead11543660ca45fee33c7f7bb1d7:/app/controllers/user_blocks_controller.rb diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 2dcac3e8a..75c9df9dc 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -3,19 +3,22 @@ class UserBlocksController < ApplicationController before_filter :authorize_web before_filter :set_locale - before_filter :require_user, :only => [:new, :create, :edit, :delete] - before_filter :require_moderator, :only => [:new, :create, :edit, :delete] + before_filter :require_user, :only => [:new, :create, :edit, :update, :revoke] + before_filter :require_moderator, :only => [:create, :update, :revoke] + before_filter :lookup_this_user, :only => [:new, :create, :blocks_on, :blocks_by] + before_filter :lookup_user_block, :only => [:show, :edit, :update, :revoke] + before_filter :require_valid_params, :only => [:create, :update] + before_filter :check_database_readable + before_filter :check_database_writable, :only => [:create, :update, :revoke] def index @user_blocks_pages, @user_blocks = paginate(:user_blocks, - :include => [:user, :moderator, :revoker], - :order => "user_blocks.end_at DESC", - :per_page => 20) + :include => [:user, :creator, :revoker], + :order => "user_blocks.ends_at DESC", + :per_page => 20) end def show - @user_block = UserBlock.find(params[:id]) - if @user and @user.id == @user_block.user_id @user_block.needs_view = false @user_block.save! @@ -24,68 +27,47 @@ class UserBlocksController < ApplicationController def new @user_block = UserBlock.new - @display_name = params[:display_name] - @this_user = User.find_by_display_name(@display_name, :conditions => {:visible => true}) end - # GET /user_blocks/1/edit def edit - @user_block = UserBlock.find(params[:id]) - params[:user_block_period] = ((@user_block.end_at - Time.now.getutc) / 1.hour).ceil.to_s + params[:user_block_period] = ((@user_block.ends_at - Time.now.getutc) / 1.hour).ceil.to_s end def create - @display_name = params[:display_name] - @this_user = User.find_by_display_name(@display_name, :conditions => {:visible => true}) - block_period = [UserBlock::PERIODS.max, params[:user_block_period].to_i].min + unless @valid_params + redirect_to :action => "new" + return + end @user_block = UserBlock.new(:user_id => @this_user.id, - :moderator_id => @user.id, + :creator_id => @user.id, :reason => params[:user_block][:reason], - :end_at => Time.now.getutc() + block_period.hours, + :ends_at => Time.now.getutc() + @block_period.hours, :needs_view => params[:user_block][:needs_view]) - if (@this_user and @user.moderator? and - params[:tried_contacting] == "yes" and - params[:tried_waiting] == "yes" and - block_period >= 0) - if @user_block.save - flash[:notice] = t('user_block.create.flash', :name => @display_name) - redirect_to @user_block - else - render :action => "new" - end + if @user_block.save + flash[:notice] = t('user_block.create.flash', :name => @this_user.display_name) + redirect_to @user_block else - if !@user.moderator? - flash[:notice] = t('user_block.create.not_a_moderator') - elsif params[:tried_contacting] != "yes" - flash[:notice] = t('user_block.create.try_contacting') - elsif params[:tried_waiting] != "yes" - flash[:notice] = t('user_block.create.try_waiting') - else - flash[:notice] = t('user_block.create.bad_parameters') - end - @display_name = @this_user.nil? ? '' : @this_user.display_name - render :action => "new" end end - def update - @user_block = UserBlock.find(params[:id]) - block_period = [72, params[:user_block_period].to_i].min - - if @user_block.moderator_id != @user.id - flash[:notice] = t('user_block.update.only_creator_can_edit') - redirect_to(@user_block) + def update + unless @valid_params + redirect_to :action => "edit" + return + end - elsif !@user_block.active? - flash[:notice] = t('user_block.update.block_expired') - redirect_to(@user_block) + if @user_block.creator_id != @user.id + flash[:error] = t('user_block.update.only_creator_can_edit') + redirect_to :action => "edit" + return + end - elsif @user_block.update_attributes({ :end_at => Time.now.getutc() + block_period.hours, - :reason => params[:user_block][:reason], - :needs_view => params[:user_block][:needs_view] }) + if @user_block.update_attributes({ :ends_at => Time.now.getutc() + @block_period.hours, + :reason => params[:user_block][:reason], + :needs_view => params[:user_block][:needs_view] }) flash[:notice] = t('user_block.update.success') redirect_to(@user_block) else @@ -96,19 +78,10 @@ class UserBlocksController < ApplicationController ## # revokes the block, setting the end_time to now def revoke - @user_block = UserBlock.find(params[:id]) - - if !@user.moderator? - flash[:notice] = t('user_block.create.not_a_moderator') - redirect_to @user_block - - elsif params[:confirm] - if @user_block.revoke! + if params[:confirm] + if @user_block.revoke! @user flash[:notice] = t'user_block.revoke.flash' redirect_to(@user_block) - else - flash[:notice] = t'user_block.revoke.error' - render :action => "edit" end end end @@ -116,30 +89,68 @@ class UserBlocksController < ApplicationController ## # shows a list of all the blocks on the given user def blocks_on - @this_user = User.find_by_display_name(params[:display_name]) - @user_blocks_pages, @user_blocks = paginate(:user_blocks, - :include => [:user, :moderator, :revoker], + :include => [:user, :creator, :revoker], :conditions => {:user_id => @this_user.id}, - :order => "user_blocks.end_at DESC", + :order => "user_blocks.ends_at DESC", :per_page => 20) end ## # shows a list of all the blocks by the given user. def blocks_by - @this_user = User.find_by_display_name(params[:display_name]) - @user_blocks_pages, @user_blocks = paginate(:user_blocks, - :include => [:user, :moderator, :revoker], - :conditions => {:moderator_id => @this_user.id}, - :order => "user_blocks.end_at DESC", - :per_page => 20) + :include => [:user, :creator, :revoker], + :conditions => {:creator_id => @this_user.id}, + :order => "user_blocks.ends_at DESC", + :per_page => 20) end private + ## + # require that the user is a moderator, or fill out a helpful error message + # and return them to the blocks index. def require_moderator - redirect_to "/403.html" unless @user.moderator? + unless @user.moderator? + flash[:error] = t('user_block.filter.not_a_moderator') + redirect_to :action => 'index' + end + end + + ## + # ensure that there is a "this_user" instance variable + def lookup_this_user + @this_user = User.find_by_display_name(params[:display_name]) + rescue ActiveRecord::RecordNotFound + redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user + end + + ## + # ensure that there is a "user_block" instance variable + def lookup_user_block + @user_block = UserBlock.find(params[:id]) + rescue ActiveRecord::RecordNotFound + render :action => "not_found", :status => :not_found + end + + ## + # check that the input parameters are valid, setting an instance + # variable if not. note that this doesn't do any redirection, as it's + # called before two different actions, each of which should redirect + # to a different place. + def require_valid_params + @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') + + elsif @user_block and !@user_block.active? + flash[:error] = t('user_block.filter.block_expired') + + else + @valid_params = true + end end end