zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-26 04:28:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-790

Browse source 
# Conflicts:
#	test/models/domain/force_delete_test.rb
#	test/system/admin_area/domains/force_delete_test.rb
This commit is contained in:
Artur Beljajev 2018-08-24 14:54:41 +03:00
commit 4b2948986b
5 changed files with 43 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/concerns/domain/force_delete.rb
View file

@ -6,6 +6,10 @@ module Concerns::Domain::ForceDelete
end
def schedule_force_delete
if discarded?
raise StandardError, 'Force delete procedure cannot be scheduled while a domain is discarded'
end
preserve_current_statuses_for_force_delete
add_force_delete_statuses
self.force_delete_at = (Time.zone.now + (Setting.redemption_grace_period.days + 1.day)).utc
@ -16,10 +20,6 @@ module Concerns::Domain::ForceDelete
end
def cancel_force_delete
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
self.force_delete_at = nil