mirror of
https://github.com/internetee/registry.git
synced 2025-05-17 09:57:23 +02:00
Story #104525314 - allow admin to remove pendingDelete and clear delete_at
This commit is contained in:
parent
69f0f8af12
commit
6c559b8c25
3 changed files with 25 additions and 9 deletions
|
@ -47,6 +47,7 @@ class Admin::DomainsController < AdminController
|
||||||
def update
|
def update
|
||||||
dp = ignore_empty_statuses
|
dp = ignore_empty_statuses
|
||||||
@domain.is_admin = true
|
@domain.is_admin = true
|
||||||
|
@domain.admin_status_update dp[:statuses]
|
||||||
|
|
||||||
if @domain.update(dp)
|
if @domain.update(dp)
|
||||||
flash[:notice] = I18n.t('domain_updated')
|
flash[:notice] = I18n.t('domain_updated')
|
||||||
|
|
|
@ -495,7 +495,7 @@ class Domain < ActiveRecord::Base
|
||||||
def cancel_pending_delete
|
def cancel_pending_delete
|
||||||
statuses.delete DomainStatus::PENDING_DELETE_CONFIRMATION
|
statuses.delete DomainStatus::PENDING_DELETE_CONFIRMATION
|
||||||
statuses.delete DomainStatus::PENDING_DELETE
|
statuses.delete DomainStatus::PENDING_DELETE
|
||||||
delete_at = nil
|
self.delete_at = nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def pricelist(operation, period_i = nil, unit = nil)
|
def pricelist(operation, period_i = nil, unit = nil)
|
||||||
|
@ -679,16 +679,31 @@ class Domain < ActiveRecord::Base
|
||||||
statuses.include?(DomainStatus::FORCE_DELETE)
|
statuses.include?(DomainStatus::FORCE_DELETE)
|
||||||
end
|
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?
|
def pending_update_prohibited?
|
||||||
(statuses_was & [
|
(statuses_was & [
|
||||||
DomainStatus::PENDING_DELETE_CONFIRMATION,
|
DomainStatus::PENDING_DELETE_CONFIRMATION,
|
||||||
DomainStatus::CLIENT_UPDATE_PROHIBITED,
|
DomainStatus::CLIENT_UPDATE_PROHIBITED,
|
||||||
DomainStatus::SERVER_UPDATE_PROHIBITED,
|
DomainStatus::SERVER_UPDATE_PROHIBITED,
|
||||||
DomainStatus::PENDING_CREATE,
|
DomainStatus::PENDING_CREATE,
|
||||||
DomainStatus::PENDING_UPDATE,
|
DomainStatus::PENDING_UPDATE,
|
||||||
DomainStatus::PENDING_DELETE,
|
DomainStatus::PENDING_DELETE,
|
||||||
DomainStatus::PENDING_RENEW,
|
DomainStatus::PENDING_RENEW,
|
||||||
DomainStatus::PENDING_TRANSFER
|
DomainStatus::PENDING_TRANSFER
|
||||||
]).present?
|
]).present?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -148,7 +148,7 @@ class DomainStatus < ActiveRecord::Base
|
||||||
INACTIVE,
|
INACTIVE,
|
||||||
FORCE_DELETE,
|
FORCE_DELETE,
|
||||||
PENDING_CREATE,
|
PENDING_CREATE,
|
||||||
PENDING_DELETE,
|
#PENDING_DELETE,
|
||||||
PENDING_RENEW,
|
PENDING_RENEW,
|
||||||
PENDING_TRANSFER,
|
PENDING_TRANSFER,
|
||||||
PENDING_UPDATE,
|
PENDING_UPDATE,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue