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

Merge branch '105842700-registrants_portal' into staging

Browse source
This commit is contained in:
Stas 2016-03-07 13:55:20 +02:00
commit a71a4dd507
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/registrant/domains_controller.rb
View file

@ -26,7 +26,7 @@ class Registrant::DomainsController < RegistrantController
dom.pending_json.present?
@domain = dom
confirm_path = "#{ENV['registrant_url']}/registrant/domain_update_confirms"
confirm_path = get_confirm_path(dom.statuses)
@verification_url = "#{confirm_path}/#{@domain.id}?token=#{@domain.registrant_verification_token}"
else
@ -74,4 +74,13 @@ class Registrant::DomainsController < RegistrantController
yield
params[:q][:valid_to_lteq] = ca_cache
end
def get_confirm_path(statuses)
if statuses.include?(DomainStatus::PENDING_UPDATE)
"#{ENV['registrant_url']}/registrant/domain_update_confirms"
elsif statuses.include?(DomainStatus::PENDING_DELETE)
"#{ENV['registrant_url']}/registrant/domain_delete_confirms"
end
end
end

6
config/locales/en.yml
View file

@ -932,10 +932,14 @@ en:
if_auth_info_is_left_empty_it_will_be_auto_generated: 'If auth info is left empty, it will be auto generated.'
each_domain_name_must_end_with_colon_sign: 'Each domain name must end with colon (:) sign.'
expiration_remind_subject: 'The %{name} domain has expired'
personal_domain_verification_url: 'Personal domain verification url'
available_verification_url_not_found: 'Available verification url not found, for domain.'
contact_already_associated_with_the_domain: 'Object association prohibits operation, contact already associated with the domain'
add_reserved_domain: 'Add domain to reserved list'
add_blocked_domain: 'Add domain to blocked list'
edit_pw: 'Edit Pw'
optional: 'Optional'
contact_already_associated_with_the_domain: 'Object association prohibits operation, contact already associated with the domain'
=======
personal_domain_verification_url: 'Personal domain verification url'
available_verification_url_not_found: 'Available verification url not found, for domain.'
>>>>>>> Temporary merge branch 2