Moved force delete button under statuses #2785

app/views/admin/domains/edit.haml

@@ -1,6 +1,13 @@
 - content_for :actions do
   = link_to(t(:add_new_status), '#', class: 'btn btn-primary js-add-status')
+  - if @domain.force_deletable?
+    = link_to(t(:set_force_delete), set_force_delete_admin_domain_path(@domain), 
+      method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
+  - else
+    = link_to(t(:unset_force_delete), unset_force_delete_admin_domain_path(@domain), 
+      method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
   = link_to(t(:back_to_domain), [:admin, @domain], class: 'btn btn-default')
+
 = render 'shared/title', name: "#{t(:edit)}: #{@domain.name}"
 
 = render 'form'

app/views/admin/domains/form/_pending_update.haml

@@ -0,0 +1 @@
+yeah

app/views/admin/domains/partials/_statuses.haml

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

app/views/admin/domains/show.haml

@@ -1,10 +1,6 @@
 - content_for :actions do
   = link_to(t(:edit_statuses), edit_admin_domain_path(@domain), class: 'btn btn-primary')
   = link_to(t(:history), admin_domain_domain_versions_path(@domain.id), method: :get, class: 'btn btn-primary')
-  - if @domain.force_deletable?
-    = link_to(t(:set_force_delete), set_force_delete_admin_domain_path(@domain), method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
-  - else
-    = link_to(t(:unset_force_delete), unset_force_delete_admin_domain_path(@domain), method: :post, data: { confirm: t(:are_you_sure) }, class: 'btn btn-warning')
 
 = render 'shared/title', name: @domain.name