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

Fix ok/inactive state, get disclosable fields strictly from Contact class

Browse source
This commit is contained in:
Karl Erik Õunapuu 2021-01-05 15:59:00 +02:00
parent bc69e05c91
commit b534827dc5
No known key found for this signature in database
GPG key ID: C9DD647298A34764
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/domain.rb
View file

@ -574,7 +574,7 @@ class Domain < ApplicationRecord
if statuses.empty? && valid? if statuses.empty? && valid?
statuses << DomainStatus::OK statuses << DomainStatus::OK
elsif (statuses.length > 1 && active?) || !valid? elsif (statuses.length > 1) || !valid?
statuses.delete(DomainStatus::OK) statuses.delete(DomainStatus::OK)
end end

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

@ -27,7 +27,7 @@ class Epp::Domain < Domain
active_techs = tech_domain_contacts.select { |x| !x.marked_for_destruction? } active_techs = tech_domain_contacts.select { |x| !x.marked_for_destruction? }
# validate registrant here as well # validate registrant here as well
([registrant] + active_admins + active_techs).each do |x| ([Contact.find_by(code: registrant.code)] + 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