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

Merge pull request #111 from internetee/story/114871365-address-cc-upcase

Browse source 
Story/114871365 address cc upcase
This commit is contained in:
Timo Võhmar 2016-03-30 16:54:02 +03:00
commit 6ee076c9a4
2 changed files with 49 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/models/contact.rb
View file

@ -32,6 +32,7 @@ class Contact < ActiveRecord::Base
validate :val_ident_valid_format?
validate :uniq_statuses?
validate :validate_html
validate :val_country_code
after_initialize do
self.statuses = [] if statuses.nil?
@ -39,7 +40,7 @@ class Contact < ActiveRecord::Base
self.ident_updated_at = Time.zone.now if new_record? && ident_updated_at.blank?
end
before_validation :set_ident_country_code
before_validation :to_upcase_country_code
before_validation :prefix_code
before_create :generate_auth_info
@ -352,14 +353,14 @@ class Contact < ActiveRecord::Base
destroy
end
def set_ident_country_code
return true unless ident_country_code_changed? && ident_country_code.present?
code = Country.new(ident_country_code)
if code
self.ident_country_code = code.alpha2
else
errors.add(:ident, :invalid_country_code)
end
def to_upcase_country_code
self.ident_country_code = ident_country_code.upcase if ident_country_code
self.country_code = country_code.upcase if country_code
end
def val_country_code
errors.add(:ident, :invalid_country_code) unless Country.new(ident_country_code)
errors.add(:ident, :invalid_country_code) unless Country.new(country_code)
end
def related_domain_descriptions