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

Merge branch '105842700-registrants_portal' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2016-03-11 14:20:11 +02:00
commit 2935101d95
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ class Registrant::DomainsController < RegistrantController
def domain_verification_url def domain_verification_url
authorize! :view, :registrant_domains authorize! :view, :registrant_domains
dom = domains.find(params[:id]) dom = domains.find(params[:id])
if (dom.statuses.include?(DomainStatus::PENDING_UPDATE) || dom.statuses.include?(DomainStatus::PENDING_DELETE)) && if (dom.statuses.include?(DomainStatus::PENDING_UPDATE) || dom.statuses.include?(DomainStatus::PENDING_DELETE_CONFIRMATION)) &&
dom.pending_json.present? dom.pending_json.present?
@domain = dom @domain = dom
@ -78,7 +78,7 @@ class Registrant::DomainsController < RegistrantController
def get_confirm_path(statuses) def get_confirm_path(statuses)
if statuses.include?(DomainStatus::PENDING_UPDATE) if statuses.include?(DomainStatus::PENDING_UPDATE)
"#{ENV['registrant_url']}/registrant/domain_update_confirms" "#{ENV['registrant_url']}/registrant/domain_update_confirms"
elsif statuses.include?(DomainStatus::PENDING_DELETE) elsif statuses.include?(DomainStatus::PENDING_DELETE_CONFIRMATION)
"#{ENV['registrant_url']}/registrant/domain_delete_confirms" "#{ENV['registrant_url']}/registrant/domain_delete_confirms"
end end
end end

2
app/views/registrant/domains/partials/_statuses.haml
View file

@ -11,7 +11,7 @@
- @domain.statuses.each do |status| - @domain.statuses.each do |status|
%tr %tr
%td %td
- if [DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE].include?(status) && @domain.pending_json.present? - if [DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE_CONFIRMATION].include?(status) && @domain.pending_json.present?
= link_to(status, domain_verification_url_registrant_domain_url(@domain.id)) = link_to(status, domain_verification_url_registrant_domain_url(@domain.id))
- else - else
= status = status