X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/14936150ac8ab5cb4e8347b772b2c966f2add43f..cdf9634d08540baf0264bdf74bd9a2f6bebfb124:/app/controllers/user_blocks_controller.rb?ds=sidebyside diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 546c8233c..d427e5fa5 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -1,5 +1,6 @@ class UserBlocksController < ApplicationController include UserMethods + include PaginationMethods layout "site" @@ -8,23 +9,29 @@ class UserBlocksController < ApplicationController 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 :lookup_user, :only => [:new, :create, :revoke_all, :blocks_on, :blocks_by] + before_action :lookup_user_block, :only => [:show, :edit, :update] 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_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 => "page" if turbo_frame_request_id == "pagination" end def show - if current_user && current_user == @user_block.user + if current_user && current_user == @user_block.user && !@user_block.deactivates_at @user_block.needs_view = false + @user_block.deactivates_at = [@user_block.ends_at, Time.now.utc].max @user_block.save! end end @@ -39,13 +46,16 @@ class UserBlocksController < ApplicationController 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.utc + @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) @@ -60,18 +70,35 @@ class UserBlocksController < ApplicationController 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] = @user_block.revoker ? t(".only_creator_or_revoker_can_edit") : t(".only_creator_can_edit") redirect_to :action => "edit" - elsif @user_block.update( - :ends_at => Time.now.utc + @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]) @@ -79,11 +106,12 @@ class UserBlocksController < ApplicationController end ## - # revokes the block, setting the end_time to now - def revoke - if request.post? && params[:confirm] && @user_block.revoke!(current_user) + # 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_block) + redirect_to user_blocks_on_path(@user) end end @@ -91,22 +119,30 @@ class UserBlocksController < ApplicationController # 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 => "page" 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 => "page" if turbo_frame_request_id == "pagination" end private @@ -131,9 +167,6 @@ class UserBlocksController < ApplicationController 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