X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/40c46a2ab8aee391f911804b181cde0015540004..e2839ae0988c8493e0f4f626695a0f4a7abd39d8:/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 7027359cc..d427e5fa5 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -10,10 +10,10 @@ class UserBlocksController < ApplicationController 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 :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, :revoke_all] + before_action :check_database_writable, :only => [:create, :update, :revoke_all] def index @params = params.permit @@ -25,11 +25,11 @@ class UserBlocksController < ApplicationController @show_user_name = true @show_creator_name = true - render :partial => "blocks" if turbo_frame_request_id == "pagination" + 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! @@ -71,7 +71,7 @@ class UserBlocksController < ApplicationController def update if @valid_params if cannot?(:update, @user_block) - flash[:error] = t(@user_block.revoker ? ".only_creator_or_revoker_can_edit" : ".only_creator_can_edit") + flash[:error] = @user_block.revoker ? t(".only_creator_or_revoker_can_edit") : t(".only_creator_can_edit") redirect_to :action => "edit" else user_block_was_active = @user_block.active? @@ -105,15 +105,6 @@ class UserBlocksController < ApplicationController end end - ## - # revokes the block, setting the end_time to now - def revoke - 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 @@ -136,7 +127,7 @@ class UserBlocksController < ApplicationController @show_user_name = false @show_creator_name = true - render :partial => "blocks" if turbo_frame_request_id == "pagination" + render :partial => "page" if turbo_frame_request_id == "pagination" end ## @@ -151,7 +142,7 @@ class UserBlocksController < ApplicationController @show_user_name = true @show_creator_name = false - render :partial => "blocks" if turbo_frame_request_id == "pagination" + render :partial => "page" if turbo_frame_request_id == "pagination" end private