mirror of
https://github.com/internetee/registry.git
synced 2025-08-04 00:42:04 +02:00
Merge branch 'registry-791' into registry-790
# Conflicts: # app/views/admin/domains/edit.html.erb # config/locales/admin/domains.en.yml
This commit is contained in:
commit
732997bf9e
6 changed files with 27 additions and 20 deletions
|
@ -16,7 +16,9 @@ module Concerns::Domain::ForceDelete
|
|||
end
|
||||
|
||||
def cancel_force_delete
|
||||
raise 'Domain must be discarded before cancelling force delete procedure' unless discarded?
|
||||
if discarded?
|
||||
raise StandardError, 'Force delete procedure cannot be cancelled while a domain is discarded'
|
||||
end
|
||||
|
||||
restore_statuses_before_force_delete
|
||||
remove_force_delete_statuses
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue