diff --git a/app/models/concerns/domain/deletable.rb b/app/models/concerns/domain/deletable.rb index a0d49decb..86c296d88 100644 --- a/app/models/concerns/domain/deletable.rb +++ b/app/models/concerns/domain/deletable.rb @@ -6,7 +6,7 @@ module Concerns::Domain::Deletable end def discard - self.statuses << DomainStatus::DELETE_CANDIDATE + statuses << DomainStatus::DELETE_CANDIDATE save end diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb index 9597330b8..aac3c1527 100644 --- a/app/presenters/domain_presenter.rb +++ b/app/presenters/domain_presenter.rb @@ -6,6 +6,17 @@ class DomainPresenter @view = view end + def name_with_status + html = domain.name + + if domain.discarded? + label = view.content_tag(:span, 'deleteCandidate', class: 'label label-warning') + html += " #{label}" + end + + html.html_safe + end + def expire_time view.l(domain.expire_time) end diff --git a/app/views/admin/domains/show.html.erb b/app/views/admin/domains/show.html.erb index 9bfb4b9b5..1501b35bb 100644 --- a/app/views/admin/domains/show.html.erb +++ b/app/views/admin/domains/show.html.erb @@ -1,3 +1,5 @@ +<% domain = DomainPresenter.new(domain: @domain, view: self) %> + @@ -5,7 +7,7 @@