Merge branch 'master' into registry-791

This commit is contained in:
Artur Beljajev 2018-04-20 17:37:43 +03:00
commit 696a3871b7
114 changed files with 905 additions and 440 deletions

View file

@ -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