X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c2af89c00e5bcb20981e737abb779ef65acd7b3e..8b840c650629d45e79f99811e9062aea5e130e33:/app/controllers/user_blocks_controller.rb diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 058c442d5..9ee371226 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -1,4 +1,7 @@ class UserBlocksController < ApplicationController + include UserMethods + include PaginationMethods + layout "site" before_action :authorize_web @@ -6,18 +9,18 @@ class UserBlocksController < ApplicationController 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]) end def show @@ -32,16 +35,18 @@ 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 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] ) @@ -62,7 +67,7 @@ class UserBlocksController < ApplicationController 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] ) @@ -79,32 +84,40 @@ class UserBlocksController < ApplicationController ## # revokes the block, setting the end_time to now def revoke - if params[:confirm] && @user_block.revoke!(current_user) + 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]) 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]) end private