Merge branch '110687814-update_values' into staging

This commit is contained in:
Stas 2016-03-24 17:36:06 +02:00
commit b70012045e
2 changed files with 6 additions and 3 deletions

View file

@ -193,7 +193,7 @@ class Epp::Contact < Contact
end end
end end
self.upid = current_user.id if current_user self.upid = current_user.registrar.id if current_user.registrar
self.up_date = Time.zone.now self.up_date = Time.zone.now
super(at) super(at)

View file

@ -508,13 +508,16 @@ class Epp::Domain < Domain
end end
if erros.empty? && verify
self.upid = current_user.registrar.id if current_user.registrar
self.up_date = Time.zone.now
end
if errors.empty? && verify && if errors.empty? && verify &&
Setting.request_confrimation_on_registrant_change_enabled && Setting.request_confrimation_on_registrant_change_enabled &&
frame.css('registrant').present? && frame.css('registrant').present? &&
frame.css('registrant').attr('verified').to_s.downcase != 'yes' frame.css('registrant').attr('verified').to_s.downcase != 'yes'
registrant_verification_asked!(frame.to_s, current_user.id) registrant_verification_asked!(frame.to_s, current_user.id)
self.upid = current_user.registrar.id if current_user.registrar
self.up_date = Time.zone.now
end end
self.deliver_emails = true # turn on email delivery for epp self.deliver_emails = true # turn on email delivery for epp