zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-23 03:06:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Story #104525314 - refactor : simplify, remove flag controlled path complexity

Browse source
This commit is contained in:
Matt Farnsworth 2015-10-30 17:46:32 +02:00
parent 853e7b3a1c
commit 2104cf2f0a
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/models/epp/domain.rb
View file

@ -491,12 +491,10 @@ class Epp::Domain < Domain
def apply_pending_delete! def apply_pending_delete!
preclean_pendings preclean_pendings
user = ApiUser.find(pending_json['current_user_id'])
frame = Nokogiri::XML(pending_json['frame'])
statuses.delete(DomainStatus::PENDING_DELETE) statuses.delete(DomainStatus::PENDING_DELETE)
DomainMailer.delete_confirmation(self).deliver_now DomainMailer.delete_confirmation(self).deliver_now
clean_pendings! if epp_destroy(frame, user, false) clean_pendings! if valid? && set_pending_delete!
true true
end end
@ -509,11 +507,10 @@ class Epp::Domain < Domain
) )
end end
def epp_destroy(frame, user_id, verify = true) def epp_destroy(frame, user_id)
return false unless valid? return false unless valid?
if verify && if Setting.request_confirmation_on_domain_deletion_enabled &&
Setting.request_confirmation_on_domain_deletion_enabled &&
frame.css('delete').attr('verified').to_s.downcase != 'yes' frame.css('delete').attr('verified').to_s.downcase != 'yes'
registrant_verification_asked!(frame.to_s, user_id) registrant_verification_asked!(frame.to_s, user_id)