zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-19 10:49:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

MERGE: merged staging at 3235647, resolved merge conflict

Browse source
This commit is contained in:
Matt Farnsworth 2015-10-30 16:12:20 +02:00
commit 45588dc72a
78 changed files with 308808 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/models/domain_status.rb
View file

@ -69,7 +69,7 @@ class DomainStatus < ActiveRecord::Base
SERVER_ADMIN_CHANGE_PROHIBITED = 'serverAdminChangeProhibited'
SERVER_TECH_CHANGE_PROHIBITED = 'serverTechChangeProhibited'
PENDING_DELETE_CONFIRMATION = 'pendingDeleteConfirmation'
FORCE_DELETE = 'forceDelete'
FORCE_DELETE = 'serverForceDelete'
DELETE_CANDIDATE = 'deleteCandidate'
EXPIRED = 'expired'
RESERVED = 'reserved'
@ -122,6 +122,7 @@ class DomainStatus < ActiveRecord::Base
class << self
def admin_statuses
<<<<<<< HEAD
[
SERVER_HOLD,
# sync with admin_statuses_map
@ -134,12 +135,31 @@ class DomainStatus < ActiveRecord::Base
SERVER_UPDATE_PROHIBITED,
SERVER_DELETE_PROHIBITED
]
=======
# [
# 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
# ]
admin_statuses_map.map(&:second)
>>>>>>> staging
end
def admin_statuses_map
[
['Hold', SERVER_HOLD],
<<<<<<< HEAD
# sync with admin_statuses
=======
>>>>>>> staging
['ManualInzone', SERVER_MANUAL_INZONE],
# [''],
['RenewProhibited', SERVER_RENEW_PROHIBITED],