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

Merge remote-tracking branch 'origin/master' into 113524121-legal_doc_min_size

Browse source 
# Conflicts:
#	public/assets/.sprockets-manifest-48c2dd3ff16b86b70040480e74a50543.json
#	public/assets/registrant-manifest.js
#	public/assets/registrar-manifest.css
#	public/assets/registrar-manifest.js
#	public/assets/registrar/application.js
This commit is contained in:
Vladimir Krylov 2016-03-16 15:09:35 +02:00
commit 0a5428f2ee
259 changed files with 2592 additions and 426072 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -489,6 +489,15 @@ class Epp::Domain < Domain
# at[:statuses] += at_add[:domain_statuses_attributes]
if registrant_id && registrant.code == frame.css('registrant')
throw :epp_error, {
code: '2305',
msg: I18n.t(:contact_already_associated_with_the_domain)
}
end
if errors.empty? && verify &&
Setting.request_confrimation_on_registrant_change_enabled &&
frame.css('registrant').present? &&