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

Resolve merge errors

Browse source
This commit is contained in:
Karl Erik Õunapuu 2020-09-02 16:25:34 +03:00
commit 73e9dd6870
817 changed files with 16875 additions and 17443 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/mailers/previews/contact_mailer_preview.rb
View file

@ -5,4 +5,4 @@ class ContactMailerPreview < ActionMailer::Preview
ContactMailer.email_changed(contact: contact, old_email: 'old@inbox.test')
end
end
end

12
test/mailers/previews/registrant_change_mailer_preview.rb
View file

@ -1,7 +1,11 @@
class RegistrantChangeMailerPreview < ActionMailer::Preview
def initialize
@domain = Domain.first
@new_registrant = Registrant.where.not(email: nil, country_code: nil).first
@domain = Domain.joins(:registrant).where.not({ contacts: { email: nil,
country_code: nil,
ident_country_code: nil } }).take
@new_registrant = Registrant.where.not(email: nil,
country_code: nil,
ident_country_code: nil).take
super
end
@ -21,7 +25,7 @@ class RegistrantChangeMailerPreview < ActionMailer::Preview
def accepted
RegistrantChangeMailer.accepted(domain: @domain,
old_registrant: @domain.registrar)
old_registrant: @domain.registrant)
end
def rejected
@ -35,4 +39,4 @@ class RegistrantChangeMailerPreview < ActionMailer::Preview
registrar: @domain.registrar,
registrant: @domain.registrant)
end
end
end