Admin pendings refactored, added delete pending managament #2785

app/views/admin/domain_versions/_version.haml

@@ -31,14 +31,6 @@
       %br
       = creator
 
-  %td
-    %p
-      = "#{domain.period}#{domain.period_unit}"
-      %br
-      = "#{l(domain.valid_from, format: :date)}"
-      %br
-      = "#{l(domain.valid_to, format: :date)}"
-
   %td
     %p
       - domain.statuses.each do |s|
@@ -52,6 +44,14 @@
       %p
         = link_to t(:pending_epp), '#', class: 'js-pending-toggle'
 
+  %td
+    %p
+      = "#{domain.period}#{domain.period_unit}"
+      %br
+      = "#{l(domain.valid_from, format: :date)}"
+      %br
+      = "#{l(domain.valid_to, format: :date)}"
+
   %td
     - registrant.each do |r|
       %p

app/views/admin/domain_versions/index.haml

@@ -9,8 +9,8 @@
         %thead
           %tr
             %th{class: 'col-xs-1'}= t(:timestap)
-            %th{class: 'col-xs-1'}= t(:period)
             %th{class: 'col-xs-2'}= t(:statuses)
+            %th{class: 'col-xs-1'}= t(:period)
             %th{class: 'col-xs-2'}= t(:registrant)
             %th{class: 'col-xs-2'}= t(:admin)
             %th{class: 'col-xs-2'}= t(:tech)

app/views/admin/domain_versions/oldindex.haml

@@ -1,28 +0,0 @@
--# .row
-  -# .col-sm-12
-    -# %h2.text-center-xs= t(:domains)
--# %hr
--# .row
-  -# .col-md-12
-    -# .table-responsive
-      -# %table.table.table-hover.table-bordered.table-condensed
-        -# %thead
-          -# %tr
-            -# %th{class: 'col-xs-1'}
-              -# = t(:name)
-            -# %th{class: 'col-xs-1'}
-              -# = sort_link(@q, 'whodunnit')
-            -# %th{class: 'col-xs-1'}
-              -# = sort_link(@q, 'created_at')
-
-        -# %tbody
-          -# - @domains.each do |domain|
-            -# - obj = domain.reify
-            -# %tr
-              -# %td= link_to(obj.name, admin_domain_version_path(obj))
-              -# %td= whodunnit_with_protocol(domain.whodunnit) unless domain.whodunnit.nil?
-              -# %td= l(obj.created_at, format: :short)
-
--# .row
-  -# .col-md-12
-    -# = paginate @domains

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

@@ -0,0 +1,8 @@
+- if (status == DomainStatus::PENDING_DELETE && f.object.pending_json.present?)
+  = link_to(t(:apply_pending), 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')
+
+  = link_to(t(:delete_pending), admin_domain_pending_delete_path(f.object.id, f.object.id), 
+    method: :delete, data: { confirm: t(:are_you_sure) },
+    class: 'btn btn-danger btn-xs')

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

@@ -1,8 +1,8 @@
 - if (status == DomainStatus::PENDING_UPDATE && f.object.pending_json.present?)
-  = link_to(t(:apply_pending), admin_domain_pending_path(f.object.id, f.object.id),
+  = link_to(t(:apply_pending), admin_domain_pending_update_path(f.object.id, f.object.id),
     method: :patch, data: { confirm: t(:are_you_sure) },
     class: 'btn btn-danger btn-xs')
 
-  = link_to(t(:delete_pending), admin_domain_pending_path(f.object.id, f.object.id), 
+  = link_to(t(:delete_pending), admin_domain_pending_update_path(f.object.id, f.object.id), 
     method: :delete, data: { confirm: t(:are_you_sure) },
     class: 'btn btn-danger btn-xs')

app/views/admin/shared/form/_statuses.haml

@@ -10,6 +10,7 @@
         .pull-right
           - if model == 'domain'
             = render 'admin/domains/form/pending_update', f: f, status: s
+            = render 'admin/domains/form/pending_delete', f: f, status: s
           = link_to(t(:delete), '#', class: 'btn btn-danger btn-xs js-destroy-status', style: delete_style)
       .panel-body
         .form-group