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

Merge remote-tracking branch 'origin/master' into 1177-bulk-force-delete

Browse source
This commit is contained in:
Karl Erik Õunapuu 2021-01-06 10:29:18 +02:00
commit ffe50a86af
No known key found for this signature in database
GPG key ID: C9DD647298A34764
5 changed files with 14 additions and 6 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?
statuses << DomainStatus::OK
elsif (statuses.length > 1 && active?) || !valid?
elsif (statuses.length > 1) || !valid?
statuses.delete(DomainStatus::OK)
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? }
# 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?
add_epp_error('2304', nil, nil, I18n.t(:contact_is_not_valid, value: x.code))
ok = false