Respect activation limit in user unlocking

https://community.openproject.org/work_packages/74373
This commit is contained in:
Oliver Günther
2026-04-23 22:42:50 +02:00
parent f579df8b4b
commit 8eca1925ec
2 changed files with 39 additions and 9 deletions
+10 -1
View File
@@ -44,6 +44,12 @@ module API
fail ::API::Errors::InvalidUserStatusTransition
end
end
def ensure_user_limit_not_reached_for_activation!
return unless OpenProject::Enterprise.user_limit_reached?
fail ::API::Errors::UnprocessableContent.new(I18n.t(:error_enterprise_activation_user_limit))
end
end
resources :users do
@@ -109,7 +115,10 @@ module API
desc "Remove lock on user account"
delete do
user_transition(@user.locked? || @user.active? || @user.deleted?) do
@user.activate! unless @user.active?
if @user.locked?
ensure_user_limit_not_reached_for_activation!
@user.activate!
end
end
end
end