zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-22 04:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity

118822101-status_added_for_error

Browse source 
(cherry picked from commit ef0b067)
This commit is contained in:
Stas 2016-07-28 11:36:36 +03:00 • committed by Vladimir Krylov
parent 8839110f10
commit 0e4a03517f
3 changed files with 27 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/models/domain.rb
View file

@ -656,16 +656,7 @@ class Domain < ActiveRecord::Base
end end
def pending_update_prohibited? def pending_update_prohibited?
(statuses_was & [ (statuses_was & DomainStatus::UPDATE_PROHIBIT_STATES).present?
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
]).present?
end end
def set_pending_update def set_pending_update
@ -689,17 +680,7 @@ class Domain < ActiveRecord::Base
end end
def pending_delete_prohibited? def pending_delete_prohibited?
(statuses_was & [ (statuses_was & DomainStatus::DELETE_PROHIBIT_STATES).present?
DomainStatus::CLIENT_DELETE_PROHIBITED,
DomainStatus::SERVER_DELETE_PROHIBITED,
DomainStatus::CLIENT_UPDATE_PROHIBITED,
DomainStatus::SERVER_UPDATE_PROHIBITED,
DomainStatus::PENDING_CREATE,
DomainStatus::PENDING_RENEW,
DomainStatus::PENDING_TRANSFER,
DomainStatus::PENDING_UPDATE,
DomainStatus::PENDING_DELETE
]).present?
end end
# let's use positive method names # let's use positive method names

23
app/models/domain_status.rb
View file

@ -95,6 +95,29 @@ class DomainStatus < ActiveRecord::Base
SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED SERVER_ADMIN_CHANGE_PROHIBITED, SERVER_TECH_CHANGE_PROHIBITED
] ]
UPDATE_PROHIBIT_STATES = [
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
]
DELETE_PROHIBIT_STATES = [
DomainStatus::CLIENT_DELETE_PROHIBITED,
DomainStatus::SERVER_DELETE_PROHIBITED,
DomainStatus::CLIENT_UPDATE_PROHIBITED,
DomainStatus::SERVER_UPDATE_PROHIBITED,
DomainStatus::PENDING_CREATE,
DomainStatus::PENDING_RENEW,
DomainStatus::PENDING_TRANSFER,
DomainStatus::PENDING_UPDATE,
DomainStatus::PENDING_DELETE
]
def epp_code_map def epp_code_map
{ {
'2302' => [ # Object exists '2302' => [ # Object exists

3
app/models/epp/domain.rb
View file

@ -11,7 +11,8 @@ class Epp::Domain < Domain
return if is_admin # this bad hack for 109086524, refactor later return if is_admin # this bad hack for 109086524, refactor later
return true if is_transfer || is_renewal return true if is_transfer || is_renewal
return unless update_prohibited? || delete_prohibited? return unless update_prohibited? || delete_prohibited?
add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation)) stat = (statuses && (DomainStatus::UPDATE_PROHIBIT_STATES + DomainStatus::DELETE_PROHIBIT_STATES)).first
add_epp_error('2304', 'status', stat, I18n.t(:object_status_prohibits_operation))
false false
end end