Story #104525314 - allow admin to remove pendingDelete and clear delete_at

app/controllers/admin/domains_controller.rb

@@ -47,6 +47,7 @@ class Admin::DomainsController < AdminController
   def update
     dp = ignore_empty_statuses
     @domain.is_admin = true
+    @domain.admin_status_update dp[:statuses]
 
     if @domain.update(dp)
       flash[:notice] = I18n.t('domain_updated')

app/models/domain.rb

@@ -495,7 +495,7 @@ class Domain < ActiveRecord::Base
   def cancel_pending_delete
     statuses.delete DomainStatus::PENDING_DELETE_CONFIRMATION
     statuses.delete DomainStatus::PENDING_DELETE
-    delete_at = nil
+    self.delete_at = nil
   end
 
   def pricelist(operation, period_i = nil, unit = nil)
@@ -679,16 +679,31 @@ class Domain < ActiveRecord::Base
     statuses.include?(DomainStatus::FORCE_DELETE)
   end
 
+  # special handling for admin changing status
+  def admin_status_update(update)
+    # check for deleted status
+    statuses.each do |s|
+      unless update.includes? s
+        case s
+          when DomainStatus::PENDING_DELETE
+            self.delete_at = nil
+          # Handle any other special remove cases?
+          # when DomainStatus::FORCE_DELETE unset_force_delete
+        end
+      end
+    end
+  end
+
   def pending_update_prohibited?
     (statuses_was & [
         DomainStatus::PENDING_DELETE_CONFIRMATION,
-      DomainStatus::CLIENT_UPDATE_PROHIBITED,
-      DomainStatus::SERVER_UPDATE_PROHIBITED,
-      DomainStatus::PENDING_CREATE,
-      DomainStatus::PENDING_UPDATE,
-      DomainStatus::PENDING_DELETE,
-      DomainStatus::PENDING_RENEW,
-      DomainStatus::PENDING_TRANSFER
+        DomainStatus::CLIENT_UPDATE_PROHIBITED,
+        DomainStatus::SERVER_UPDATE_PROHIBITED,
+        DomainStatus::PENDING_CREATE,
+        DomainStatus::PENDING_UPDATE,
+        DomainStatus::PENDING_DELETE,
+        DomainStatus::PENDING_RENEW,
+        DomainStatus::PENDING_TRANSFER
     ]).present?
   end
 

app/models/domain_status.rb

@@ -148,7 +148,7 @@ class DomainStatus < ActiveRecord::Base
         INACTIVE,
         FORCE_DELETE,
         PENDING_CREATE,
-        PENDING_DELETE,
+        #PENDING_DELETE,
         PENDING_RENEW,
         PENDING_TRANSFER,
         PENDING_UPDATE,