X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/754a0a9cb5c49114181fd1d1181eea0d757dbac4..1bee96ede16e1dab41ad82efb9f2486da68a642f:/app/controllers/user_blocks_controller.rb?ds=inline diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 71a0b4c31..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 @@ -21,10 +21,15 @@ class UserBlocksController < ApplicationController 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! @@ -65,9 +70,8 @@ class UserBlocksController < ApplicationController def update if @valid_params - 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") + 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" else user_block_was_active = @user_block.active? @@ -76,7 +80,10 @@ class UserBlocksController < ApplicationController @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? + 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 @@ -98,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 @@ -125,6 +123,11 @@ class UserBlocksController < ApplicationController 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 ## @@ -135,6 +138,11 @@ class UserBlocksController < ApplicationController 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