X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/9a9b045372a6f48420a9a6dacfde52c34ab7abce..1e62ae4b18c3cea2c0153709a5968f1df3a3fe8c:/app/controllers/user_blocks_controller.rb diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 467ca4c3c..3b7ef30f9 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -1,25 +1,30 @@ class UserBlocksController < ApplicationController + include UserMethods + include PaginationMethods + layout "site" before_action :authorize_web before_action :set_locale - before_action :require_user, :only => [:new, :create, :edit, :update, :revoke] - before_action :require_moderator, :only => [:new, :create, :edit, :update, :revoke] - before_action :lookup_this_user, :only => [:new, :create, :blocks_on, :blocks_by] + + authorize_resource + + 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 - @user_blocks_pages, @user_blocks = paginate(:user_blocks, - :include => [:user, :creator, :revoker], - :order => "user_blocks.ends_at DESC", - :per_page => 20) + @params = params.permit + + 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 - if @user && @user.id == @user_block.user_id + if current_user && current_user == @user_block.user @user_block.needs_view = false @user_block.save! end @@ -30,21 +35,23 @@ 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_id => @this_user.id, - :creator_id => @user.id, + :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] ) if @user_block.save - flash[:notice] = t("user_block.create.flash", :name => @this_user.display_name) + flash[:notice] = t(".flash", :name => @user.display_name) redirect_to @user_block else render :action => "new" @@ -56,18 +63,24 @@ class UserBlocksController < ApplicationController def update if @valid_params - if @user_block.creator_id != @user.id - flash[:error] = t("user_block.update.only_creator_can_edit") + if current_user != @user_block.creator && + current_user != @user_block.revoker + flash[:error] = t(@user_block.revoker ? ".only_creator_or_revoker_can_edit" : ".only_creator_can_edit") redirect_to :action => "edit" - elsif @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 - 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 + if !user_block_was_active && @user_block.active? + flash.now[:error] = t(".inactive_block_cannot_be_reactivated") + render :action => "edit" + elsif @user_block.save + flash[:notice] = t(".success") + redirect_to @user_block + else + render :action => "edit" + end end else redirect_to edit_user_block_path(:id => params[:id]) @@ -77,32 +90,40 @@ class UserBlocksController < ApplicationController ## # 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 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 - @user_blocks_pages, @user_blocks = paginate(:user_blocks, - :include => [:user, :creator, :revoker], - :conditions => { :user_id => @this_user.id }, - :order => "user_blocks.ends_at DESC", - :per_page => 20) + @params = params.permit(:display_name) + + 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 - @user_blocks_pages, @user_blocks = paginate(:user_blocks, - :include => [:user, :creator, :revoker], - :conditions => { :creator_id => @this_user.id }, - :order => "user_blocks.ends_at DESC", - :per_page => 20) + @params = params.permit(:display_name) + + 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 @@ -124,11 +145,8 @@ class UserBlocksController < ApplicationController @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 && !@user_block.active? - flash[:error] = t("user_block.filter.block_expired") + if UserBlock::PERIODS.exclude?(@block_period) + flash[:error] = t("user_blocks.filter.block_period") else @valid_params = true