Merge branch 'master' into registry-927

This commit is contained in:
Maciej Szlosarczyk 2018-08-31 14:25:59 +03:00
commit 2636fe2525
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
40 changed files with 313 additions and 105 deletions

View file

@ -35,7 +35,7 @@ class DomainPresenter
end
def delete_date
view.l(domain.delete_time, format: :date) if domain.delete_time
view.l(domain.delete_at, format: :date) if domain.delete_at
end
def force_delete_date
@ -73,6 +73,15 @@ class DomainPresenter
class: 'dropdown-item')
end
def keep_btn
return unless domain.discarded?
view.link_to view.t('admin.domains.edit.keep_btn'), view.keep_admin_domain_path(@domain),
method: :patch,
data: { confirm: view.t('admin.domains.edit.keep_btn_confirm') },
class: 'btn btn-default'
end
private
def schedule_force_delete_btn