diff --git a/app/models/contact.rb b/app/models/contact.rb index 76af74d35..1bfca23c9 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -215,10 +215,6 @@ class Contact < ActiveRecord::Base STDOUT << "#{Time.zone.now.utc} - Successfully destroyed #{counter} orphaned contacts\n" unless Rails.env.test? end - def privs - where("ident_type = '#{PRIV}'") - end - def admin_statuses [ SERVER_UPDATE_PROHIBITED, diff --git a/app/models/registrar.rb b/app/models/registrar.rb index 734e68898..f94ca000d 100644 --- a/app/models/registrar.rb +++ b/app/models/registrar.rb @@ -9,7 +9,6 @@ class Registrar < ActiveRecord::Base has_many :accounts has_many :nameservers, through: :domains has_many :whois_records - has_many :priv_contacts, -> { privs }, class_name: 'Contact' has_many :white_ips, dependent: :destroy delegate :balance, to: :cash_account, allow_nil: true diff --git a/doc/models_brief.svg b/doc/models_brief.svg index 6a2b3f428..21e5a081e 100644 --- a/doc/models_brief.svg +++ b/doc/models_brief.svg @@ -1042,25 +1042,11 @@ -Registrar->Contact - - - -priv_contacts - - Registrar->Contact - -Registrar->Contact - - - -priv_contacts - Registrar->Domain diff --git a/doc/models_complete.svg b/doc/models_complete.svg index 2a67d0970..172c92e53 100644 --- a/doc/models_complete.svg +++ b/doc/models_complete.svg @@ -1665,25 +1665,11 @@ -Registrar->Contact - - - -priv_contacts - - Registrar->Contact - -Registrar->Contact - - - -priv_contacts - Registrar->Domain diff --git a/spec/models/registrar_spec.rb b/spec/models/registrar_spec.rb index 1230899bc..45acfdab1 100644 --- a/spec/models/registrar_spec.rb +++ b/spec/models/registrar_spec.rb @@ -35,10 +35,6 @@ describe Registrar do @registrar.reference_no.should_not be_blank @registrar.reference_no.last(10).to_i.should_not == 0 end - - it 'should not have priv contacts' do - @registrar.priv_contacts.size.should == 0 - end end context 'with valid attributes' do @@ -120,9 +116,5 @@ describe Registrar do registrar.valid? registrar.errors.full_messages.should == ['Code is forbidden to use'] end - - it 'should not have priv contacts' do - @registrar.priv_contacts.size.should == 0 - end end end