zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-12 23:54:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove Bullet-related code

Browse source
This commit is contained in:
Artur Beljajev 2019-10-19 13:09:41 +03:00
parent 558261c047
commit c9fbc9269e
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/epp/domains_controller.rb
View file

@ -115,8 +115,6 @@ module Epp
def delete def delete
authorize! :delete, @domain, @password authorize! :delete, @domain, @password
# all includes for bullet
@domain = Epp::Domain.where(id: @domain.id).includes(nameservers: :versions).first
handle_errors(@domain) and return unless @domain.can_be_deleted? handle_errors(@domain) and return unless @domain.can_be_deleted?

11
app/models/epp/domain.rb
View file

@ -23,12 +23,8 @@ class Epp::Domain < Domain
active_admins = admin_domain_contacts.select { |x| !x.marked_for_destruction? } active_admins = admin_domain_contacts.select { |x| !x.marked_for_destruction? }
active_techs = tech_domain_contacts.select { |x| !x.marked_for_destruction? } active_techs = tech_domain_contacts.select { |x| !x.marked_for_destruction? }
# bullet workaround
ac = active_admins.map { |x| Contact.find(x.contact_id) }
tc = active_techs.map { |x| Contact.find(x.contact_id) }
# validate registrant here as well # validate registrant here as well
([registrant] + ac + tc).each do |x| ([registrant] + active_admins + active_techs).each do |x|
unless x.valid? unless x.valid?
add_epp_error('2304', nil, nil, I18n.t(:contact_is_not_valid, value: x.code)) add_epp_error('2304', nil, nil, I18n.t(:contact_is_not_valid, value: x.code))
ok = false ok = false
@ -123,9 +119,8 @@ class Epp::Domain < Domain
def attach_default_contacts def attach_default_contacts
return if registrant.blank? return if registrant.blank?
regt = Registrant.find(registrant.id) # temp for bullet tech_contacts << registrant if tech_domain_contacts.blank?
tech_contacts << regt if tech_domain_contacts.blank? admin_contacts << registrant if admin_domain_contacts.blank? && !registrant.org?
admin_contacts << regt if admin_domain_contacts.blank? && !regt.org?
end end
def attrs_from(frame, current_user, action = nil) def attrs_from(frame, current_user, action = nil)