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

Merge branch 'story/116761157-contact-dyn-states' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2016-05-31 17:40:16 +03:00
commit 1063807528
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/contact.rb
View file

@ -36,7 +36,6 @@ class Contact < ActiveRecord::Base
validate :val_ident_type validate :val_ident_type
validate :val_ident_valid_format? validate :val_ident_valid_format?
validate :uniq_statuses?
validate :validate_html validate :validate_html
validate :val_country_code validate :val_country_code
@ -268,12 +267,16 @@ class Contact < ActiveRecord::Base
calculated = Array(read_attribute(:statuses)) calculated = Array(read_attribute(:statuses))
calculated.delete(Contact::OK) calculated.delete(Contact::OK)
calculated.delete(Contact::LINKED) calculated.delete(Contact::LINKED)
calculated << Contact::OK if calculated.empty? && valid? calculated << Contact::OK if calculated.empty?# && valid?
calculated << Contact::LINKED if domains_present? calculated << Contact::LINKED if domains_present?
calculated.uniq calculated.uniq
end end
def statuses= arr
write_attribute(:statuses, Array(arr).uniq)
end
def to_s def to_s
name || '[no name]' name || '[no name]'
end end
@ -313,11 +316,6 @@ class Contact < ActiveRecord::Base
end end
end end
def uniq_statuses?
return true unless statuses.detect { |s| statuses.count(s) > 1 }
errors.add(:statuses, :not_uniq)
false
end
def org? def org?
ident_type == ORG ident_type == ORG