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

Merge branch '111601356-ident_type_validation' into staging

Browse source
This commit is contained in:
Stas 2016-05-25 17:37:08 +03:00
commit 759b6b7248
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/contact.rb
View file

@ -33,7 +33,7 @@ class Contact < ActiveRecord::Base
uniqueness: { message: :epp_id_taken },
format: { with: /\A[\w\-\:\.\_]*\z/i, message: :invalid },
length: { maximum: 100, message: :too_long_contact_code }
validates :ident_type, inclusion: {in: %w( org priv birthday), message: :invalid}
validates :ident_type, inclusion: {in: %w( org priv birthday), message: :ident_type_invalid}
validate :val_ident_valid_format?
validate :uniq_statuses?
validate :validate_html

4
app/models/epp/contact.rb
View file

@ -126,13 +126,15 @@ class Epp::Contact < Contact
[:ident, :invalid_birthday_format],
[:ident, :invalid_country_code],
[:ident_type, :missing],
[:ident_type, :invalid],
[:code, :invalid],
[:code, :too_long_contact_code]
],
'2302' => [ # Object exists
[:code, :epp_id_taken]
],
'2304' => [ # Object status prohibits operation
[:ident_type, :epp_ident_type_invalid, { value: { obj: 'code', val: code } }]
],
'2305' => [ # Association exists
[:domains, :exist]
],