Merge branch 'master' of github.com:domify/registry

app/models/ability.rb

@@ -123,7 +123,8 @@ class Ability
     can :manage, WhiteIp
     can :read, ApiLog::EppLog
     can :read, ApiLog::ReppLog
-    # can :index, :delayed_job
+    can :update, :pending
+    can :destroy, :pending
     can :create, :zonefile
     can :access, :settings_menu
   end

app/models/domain.rb

@@ -367,6 +367,8 @@ class Domain < ActiveRecord::Base
     self.pending_json = {}
     statuses.delete(DomainStatus::PENDING_UPDATE)
     statuses.delete(DomainStatus::PENDING_DELETE)
+    status_notes[DomainStatus::PENDING_UPDATE] = ''
+    status_notes[DomainStatus::PENDING_DELETE] = ''
     save
   end
 

app/models/domain_status.rb

@@ -120,12 +120,49 @@ class DomainStatus < ActiveRecord::Base
   end
 
   class << self
-    def statuses_for_client
-      CLIENT_STATUSES.map { |x| x.sub('client', '') }
+    def admin_statuses
+      [
+        SERVER_HOLD, 
+        # sync with admin_statuses_map
+        # SERVER_MANUAL_INZONE, 
+        # SERVER_RENEW_PROHIBITED, 
+        # SERVER_TRANSFER_PROHIBITED,
+        # SERVER_REGISTRANT_CHANGE_PROHIBITED,
+        # SERVER_ADMIN_CHANGE_PROHIBITED, 
+        # SERVER_TECH_CHANGE_PROHIBITED,
+        SERVER_DELETE_PROHIBITED, 
+        SERVER_UPDATE_PROHIBITED
+      ]
     end
 
-    def statuses_for_admin
-      SERVER_STATUSES.map { |x| [x.sub('server', ''), x] }
+    def admin_statuses_map
+      [
+        ['Hold', SERVER_HOLD], 
+        # sync with admin_statuses
+        # ['ManualInzone', SERVER_MANUAL_INZONE], 
+        # [''],
+        # ['RenewProhibited', SERVER_RENEW_PROHIBITED], 
+        # ['TransferProhibited', SERVER_TRANSFER_PROHIBITED],
+        # ['RegistrantChangeProhibited', SERVER_REGISTRANT_CHANGE_PROHIBITED],
+        # ['AdminChangeProhibited', SERVER_ADMIN_CHANGE_PROHIBITED], 
+        # ['TechChangeProhibited', SERVER_TECH_CHANGE_PROHIBITED],
+        # [''],
+        ['UpdateProhibited', SERVER_UPDATE_PROHIBITED], 
+        ['DeleteProhibited', SERVER_DELETE_PROHIBITED]
+      ]
+    end
+
+    def admin_not_deletable_statuses
+      [
+        OK, 
+        INACTIVE, 
+        FORCE_DELETE,
+        PENDING_CREATE,
+        PENDING_DELETE,
+        PENDING_RENEW,
+        PENDING_TRANSFER,
+        PENDING_UPDATE
+      ]
     end
   end
 end

app/models/epp/domain.rb

@@ -433,9 +433,10 @@ class Epp::Domain < Domain
 
     return unless update(frame, user, false)
     clean_pendings!
-    self.deliver_emails = true # turn on email delivery for epp
+    self.deliver_emails = true # turn on email delivery
     DomainMailer.registrant_updated_notification_for_new_registrant(self).deliver_now
     old_registrant_email.deliver_now
+    true
   end
 
   def apply_pending_delete!
@@ -446,6 +447,7 @@ class Epp::Domain < Domain
     DomainMailer.delete_confirmation(self).deliver_now
 
     clean_pendings! if epp_destroy(frame, user, false)
+    true
   end
 
   def attach_legal_document(legal_document_data)