class UserBlocksController < ApplicationController
- layout 'site'
-
- before_filter :authorize_web
- before_filter :set_locale
- 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]
+ layout "site"
+
+ 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, :creator, :revoker],
:order => "user_blocks.ends_at DESC",
end
def show
- 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
end
def create
- unless @valid_params
- redirect_to :action => "new"
- return
- end
-
- @user_block = UserBlock.new(:user_id => @this_user.id,
- :creator_id => @user.id,
- :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 => @this_user.display_name)
- redirect_to @user_block
+ 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(".flash", :name => @user.display_name)
+ redirect_to @user_block
+ else
+ render :action => "new"
+ end
else
- render :action => "new"
+ redirect_to new_user_block_path(:display_name => params[:display_name])
end
end
- def update
- unless @valid_params
- redirect_to :action => "edit"
- return
- end
-
- if @user_block.creator_id != @user.id
- flash[:notice] = t('user_block.update.only_creator_can_edit')
- redirect_to :action => "edit"
- return
- end
-
- 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)
+ def update
+ 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
- if params[:confirm]
- if @user_block.revoke! @user
- flash[:notice] = t'user_block.revoke.flash'
- redirect_to(@user_block)
- end
+ if params[:confirm] && @user_block.revoke!(current_user)
+ flash[:notice] = t ".flash"
+ redirect_to(@user_block)
end
end
##
# shows a list of all the blocks on the given user
def blocks_on
+ @params = params.permit(:display_name)
@user_blocks_pages, @user_blocks = paginate(:user_blocks,
:include => [:user, :creator, :revoker],
- :conditions => {:user_id => @this_user.id},
+ :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
+ @params = params.permit(:display_name)
@user_blocks_pages, @user_blocks = paginate(:user_blocks,
:include => [:user, :creator, :revoker],
- :conditions => {:creator_id => @this_user.id},
+ :conditions => { :creator_id => @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 login screen where they might be able to login as
- # a moderator.
- def require_moderator
- unless @user.moderator?
- flash[:notice] = 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])
- 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
##
@block_period = params[:user_block_period].to_i
@valid_params = false
- if !UserBlock::PERIODS.include?(@block_period)
- flash[:notice] = t('user_block.filter.block_period')
-
- elsif @user_block and !@user_block.active?
- flash[:notice] = t('user_block.filter.block_expired')
-
+ 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_expired")
+
else
@valid_params = true
end
end
-
end
projects / rails.git / blobdiff