class UserBlocksController < ApplicationController
- layout 'site'
+ layout "site"
- 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_action :authorize_web
+ before_action :set_locale
+
+ 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]
+ before_action :check_database_readable
+ before_action :check_database_writable, :only => [:create, :update, :revoke]
def index
+ @params = params.permit
@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
+ if current_user && current_user == @user_block.user
@user_block.needs_view = false
@user_block.save!
end
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
-
- @user_block = UserBlock.new(:user_id => @this_user.id,
- :moderator_id => @user.id,
- :reason => params[:user_block][:reason],
- :end_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 @valid_params
+ @user_block = UserBlock.new(
+ :user => @user,
+ :creator => current_user,
+ :reason => params[:user_block][:reason],
+ :ends_at => Time.now.getutc + @block_period.hours,
+ :needs_view => params[:user_block][:needs_view]
+ )
+
if @user_block.save
- flash[:notice] = t('user_block.create.flash', :name => @display_name)
+ flash[:notice] = t(".flash", :name => @user.display_name)
redirect_to @user_block
else
render :action => "new"
end
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"
+ redirect_to new_user_block_path(:display_name => params[:display_name])
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)
-
- elsif !@user_block.active?
- flash[:notice] = t('user_block.update.block_expired')
- redirect_to(@user_block)
-
- 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] })
- flash[:notice] = t('user_block.update.success')
- redirect_to(@user_block)
+ if @valid_params
+ if @user_block.creator != current_user
+ flash[:error] = t(".only_creator_can_edit")
+ redirect_to :action => "edit"
+ elsif @user_block.update(
+ :ends_at => Time.now.getutc + @block_period.hours,
+ :reason => params[:user_block][:reason],
+ :needs_view => params[:user_block][:needs_view]
+ )
+ flash[:notice] = t(".success")
+ redirect_to(@user_block)
+ else
+ render :action => "edit"
+ end
else
- render :action => "edit"
+ redirect_to edit_user_block_path(:id => params[:id])
end
end
##
# 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!
- flash[:notice] = t'user_block.revoke.flash'
+ if params[:confirm]
+ if @user_block.revoke! current_user
+ flash[:notice] = t ".flash"
redirect_to(@user_block)
- else
- flash[:notice] = t'user_block.revoke.error'
- render :action => "edit"
end
end
end
##
# shows a list of all the blocks on the given user
def blocks_on
- @this_user = User.find_by_display_name(params[:display_name])
-
+ @params = params.permit(:display_name)
@user_blocks_pages, @user_blocks = paginate(:user_blocks,
- :include => [:user, :moderator, :revoker],
- :conditions => {:user_id => @this_user.id},
- :order => "user_blocks.end_at DESC",
+ :include => [:user, :creator, :revoker],
+ :conditions => { :user_id => @user.id },
+ :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])
-
+ @params = params.permit(: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 => @user.id },
+ :order => "user_blocks.ends_at DESC",
+ :per_page => 20)
end
private
- def require_moderator
- redirect_to "/403.html" unless @user.moderator?
+
+ ##
+ # 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_blocks.filter.block_period")
+
+ elsif @user_block && !@user_block.active?
+ flash[:error] = t("user_blocks.filter.block_expired")
+
+ else
+ @valid_params = true
+ end
+ end
end
projects / rails.git / blobdiff