class UserBlocksController < ApplicationController
+ include UserMethods
+ include PaginationMethods
+
layout "site"
before_action :authorize_web
authorize_resource
- before_action :lookup_user, :only => [:new, :create, :blocks_on, :blocks_by]
+ before_action :lookup_user, :only => [:new, :create, :revoke_all, :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]
+ before_action :check_database_writable, :only => [:create, :update, :revoke, :revoke_all]
def index
@params = params.permit
- @user_blocks_pages, @user_blocks = paginate(:user_blocks,
- :include => [:user, :creator, :revoker],
- :order => "user_blocks.ends_at DESC",
- :per_page => 20)
+
+ user_blocks = UserBlock.all
+
+ @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker])
+
+ @show_user_name = true
+ @show_creator_name = true
+
+ render :partial => "blocks" if turbo_frame_request_id == "pagination"
end
def show
if current_user && current_user == @user_block.user
@user_block.needs_view = false
+ @user_block.deactivates_at = [@user_block.ends_at, Time.now.utc].max
@user_block.save!
end
end
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
if @valid_params
+ now = Time.now.utc
@user_block = UserBlock.new(
:user => @user,
:creator => current_user,
:reason => params[:user_block][:reason],
- :ends_at => Time.now.getutc + @block_period.hours,
+ :created_at => now,
+ :ends_at => now + @block_period.hours,
:needs_view => params[:user_block][:needs_view]
)
+ @user_block.deactivates_at = @user_block.ends_at unless @user_block.needs_view
if @user_block.save
flash[:notice] = t(".flash", :name => @user.display_name)
def update
if @valid_params
- if @user_block.creator != current_user
- flash[:error] = t(".only_creator_can_edit")
+ if cannot?(:update, @user_block)
+ flash[:error] = t(@user_block.revoker ? ".only_creator_or_revoker_can_edit" : ".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"
+ user_block_was_active = @user_block.active?
+ @user_block.reason = params[:user_block][:reason]
+ @user_block.needs_view = params[:user_block][:needs_view]
+ @user_block.ends_at = Time.now.utc + @block_period.hours
+ @user_block.deactivates_at = (@user_block.ends_at unless @user_block.needs_view)
+ @user_block.revoker = current_user if user_block_was_active && !@user_block.active?
+ if user_block_was_active && @user_block.active? && current_user != @user_block.creator
+ flash.now[:error] = t(".only_creator_can_edit_without_revoking")
+ render :action => "edit"
+ elsif !user_block_was_active && @user_block.active?
+ flash.now[:error] = t(".inactive_block_cannot_be_reactivated")
+ render :action => "edit"
+ else
+ unless user_block_was_active
+ @user_block.ends_at = @user_block.ends_at_was
+ @user_block.deactivates_at = @user_block.deactivates_at_was
+ @user_block.deactivates_at = [@user_block.ends_at, @user_block.updated_at].max unless @user_block.deactivates_at # take updated_at into account before deactivates_at is backfilled
+ end
+ if @user_block.save
+ flash[:notice] = t(".success")
+ redirect_to @user_block
+ else
+ render :action => "edit"
+ end
+ end
end
else
redirect_to edit_user_block_path(:id => params[:id])
##
# revokes the block, setting the end_time to now
def revoke
- if params[:confirm]
- if @user_block.revoke! current_user
- flash[:notice] = t ".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
+
+ ##
+ # revokes all active blocks
+ def revoke_all
+ if request.post? && params[:confirm]
+ @user.blocks.active.each { |block| block.revoke!(current_user) }
+ flash[:notice] = t ".flash"
+ redirect_to user_blocks_on_path(@user)
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 => @user.id },
- :order => "user_blocks.ends_at DESC",
- :per_page => 20)
+
+ user_blocks = UserBlock.where(:user => @user)
+
+ @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker])
+
+ @show_user_name = false
+ @show_creator_name = true
+
+ render :partial => "blocks" if turbo_frame_request_id == "pagination"
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 => @user.id },
- :order => "user_blocks.ends_at DESC",
- :per_page => 20)
+
+ user_blocks = UserBlock.where(:creator => @user)
+
+ @user_blocks, @newer_user_blocks_id, @older_user_blocks_id = get_page_items(user_blocks, :includes => [:user, :creator, :revoker])
+
+ @show_user_name = true
+ @show_creator_name = false
+
+ render :partial => "blocks" if turbo_frame_request_id == "pagination"
end
private
@block_period = params[:user_block_period].to_i
@valid_params = false
- if !UserBlock::PERIODS.include?(@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_blocks.filter.block_expired")
-
else
@valid_params = true
end
projects / rails.git / blobdiff