Merge branch '104525314-domain-object-states' into staging

This commit is contained in:
Matt Farnsworth 2015-11-19 17:00:31 +02:00
commit b495fbc8cc
7 changed files with 45 additions and 33 deletions

View file

@ -1,4 +1,4 @@
- if (status == DomainStatus::PENDING_DELETE || status == DomainStatus::PENDING_DELETE_CONFIRMATION)
- if status == DomainStatus::PENDING_DELETE_CONFIRMATION
= link_to(t(:accept_delete), admin_domain_pending_delete_path(f.object.id, f.object.id),
method: :patch, data: { confirm: t(:are_you_sure) },
class: 'btn btn-danger btn-xs')