From 66e7253dc3c85b3ab85c0ad5ba4a4ec466f5efb0 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 31 May 2016 17:39:45 +0300 Subject: [PATCH 1/2] Story#116761157 - remove statuses uniqueness validation as no need any more --- app/models/contact.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/models/contact.rb b/app/models/contact.rb index e2f47bec7..dac2323fa 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -34,7 +34,6 @@ class Contact < ActiveRecord::Base format: { with: /\A[\w\-\:\.\_]*\z/i, message: :invalid }, length: { maximum: 100, message: :too_long_contact_code } validate :val_ident_valid_format? - validate :uniq_statuses? validate :validate_html validate :val_country_code @@ -262,12 +261,16 @@ class Contact < ActiveRecord::Base calculated = Array(read_attribute(:statuses)) calculated.delete(Contact::OK) 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.uniq end + def statuses= arr + write_attribute(:statuses, arr.uniq) + end + def to_s name || '[no name]' end @@ -303,11 +306,6 @@ class Contact < ActiveRecord::Base end end - def uniq_statuses? - return true unless statuses.detect { |s| statuses.count(s) > 1 } - errors.add(:statuses, :not_uniq) - false - end def org? ident_type == ORG From 7ea563790dd9a14bca4b008bc423230f3eaa14dc Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 31 May 2016 17:40:00 +0300 Subject: [PATCH 2/2] Story#116761157 - remove statuses uniqueness validation as no need any more --- app/models/contact.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/contact.rb b/app/models/contact.rb index dac2323fa..cf5849fa9 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -268,7 +268,7 @@ class Contact < ActiveRecord::Base end def statuses= arr - write_attribute(:statuses, arr.uniq) + write_attribute(:statuses, Array(arr).uniq) end def to_s