From a48abe621e3a2cf7d761824f66c3ba3ee4c6ff3a Mon Sep 17 00:00:00 2001 From: Matt Farnsworth Date: Wed, 18 Nov 2015 10:28:23 +0200 Subject: [PATCH] Story #104525314 - clean up, finishes prior commit 9cf287b35c2e6e270991ec4f00d4a1b641b3a8a7 --- app/models/epp/domain.rb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb index 821b1eb77..2c3c764f2 100644 --- a/app/models/epp/domain.rb +++ b/app/models/epp/domain.rb @@ -445,19 +445,8 @@ class Epp::Domain < Domain at_add = attrs_from(frame.css('add'), current_user, 'add') at[:nameservers_attributes] += at_add[:nameservers_attributes] - - if !at[:admin_domain_contacts_attributes].empty? && admin_change_prohibited? - add_epp_error('2304', 'admin', DomainStatus::SERVER_ADMIN_CHANGE_PROHIBITED, I18n.t(:object_status_prohibits_operation)) - else - at[:admin_domain_contacts_attributes] += at_add[:admin_domain_contacts_attributes] - end - - if !at[:tech_domain_contacts_attributes].empty? && tech_change_prohibited? - add_epp_error('2304', 'tech', DomainStatus::SERVER_TECH_CHANGE_PROHIBITED, I18n.t(:object_status_prohibits_operation)) - else - at[:tech_domain_contacts_attributes] += at_add[:tech_domain_contacts_attributes] - end - + at[:admin_domain_contacts_attributes] += at_add[:admin_domain_contacts_attributes] + at[:tech_domain_contacts_attributes] += at_add[:tech_domain_contacts_attributes] at[:dnskeys_attributes] += at_add[:dnskeys_attributes] at[:statuses] = statuses - domain_statuses_attrs(frame.css('rem'), 'rem') + domain_statuses_attrs(frame.css('add'), 'add')