X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/58ac035d4198759acdf49707145b474cf182e897..de9583407026e2510a51ef76c494fa2b40e6e363:/app/controllers/user_blocks_controller.rb diff --git a/app/controllers/user_blocks_controller.rb b/app/controllers/user_blocks_controller.rb index 3ab217a60..664ac5681 100644 --- a/app/controllers/user_blocks_controller.rb +++ b/app/controllers/user_blocks_controller.rb @@ -63,8 +63,9 @@ class UserBlocksController < ApplicationController def update if @valid_params - if @user_block.creator != current_user - flash[:error] = t(".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( :ends_at => Time.now.utc + @block_period.hours,