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

Story#114871365 - add address country_code validation

Browse source
This commit is contained in:
Vladimir Krylov 2016-03-08 15:06:53 +02:00
parent 028fff88cd
commit 65f6b4b43e
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/models/contact.rb
View file

@ -39,8 +39,8 @@ class Contact < ActiveRecord::Base
self.ident_updated_at = Time.zone.now if new_record? && ident_updated_at.blank? self.ident_updated_at = Time.zone.now if new_record? && ident_updated_at.blank?
end end
before_validation :set_ident_country_code before_validation :val_upcase_country_code
before_validation :prefix_code before_validation :val_prefix_code
before_create :generate_auth_info before_create :generate_auth_info
before_update :manage_emails before_update :manage_emails
@ -298,7 +298,7 @@ class Contact < ActiveRecord::Base
end end
# rubocop:disable Metrics/CyclomaticComplexity # rubocop:disable Metrics/CyclomaticComplexity
def prefix_code def val_prefix_code
return nil unless new_record? return nil unless new_record?
return nil if registrar.blank? return nil if registrar.blank?
code = self[:code] code = self[:code]
@ -338,13 +338,17 @@ class Contact < ActiveRecord::Base
destroy destroy
end end
def set_ident_country_code def val_upcase_country_code
return true unless ident_country_code_changed? && ident_country_code.present? if code = Country.new(ident_country_code)
code = Country.new(ident_country_code)
if code
self.ident_country_code = code.alpha2 self.ident_country_code = code.alpha2
else else
errors.add(:ident, :invalid_country_code) errors.add(:ident, :invalid_country_code)
end if ident_country_code_changed? && ident_country_code.present?
if code = Country.new(country_code)
self.country_code = code.alpha2
else
errors.add(:country_code, :invalid_country_code)
end end
end end