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

Merge: resolve merge conflict

Browse source
This commit is contained in:
Matt Farnsworth 2015-10-30 16:48:23 +02:00
parent 45588dc72a
commit 853e7b3a1c
2 changed files with 1 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/domain.rb
View file

@ -379,7 +379,7 @@ class Domain < ActiveRecord::Base
return false if statuses.include_any?(DomainStatus::DELETE_CANDIDATE, DomainStatus::SERVER_RENEW_PROHIBITED, return false if statuses.include_any?(DomainStatus::DELETE_CANDIDATE, DomainStatus::SERVER_RENEW_PROHIBITED,
DomainStatus::CLIENT_RENEW_PROHIBITED, DomainStatus::PENDING_RENEW, DomainStatus::CLIENT_RENEW_PROHIBITED, DomainStatus::PENDING_RENEW,
DomainStatus::PENDING_TRANSFER, DomainStatus::PENDING_DELETE, DomainStatus::PENDING_TRANSFER, DomainStatus::PENDING_DELETE,
DomainStatus::PENDING_UPDATE, 'pendingDeleteConfirmation') DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE_CONFIRMATION)
true true
end end

31
app/models/domain_status.rb
View file

@ -122,44 +122,13 @@ class DomainStatus < ActiveRecord::Base
class << self class << self
def admin_statuses def admin_statuses
<<<<<<< HEAD
[
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_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) admin_statuses_map.map(&:second)
>>>>>>> staging
end end
def admin_statuses_map def admin_statuses_map
[ [
['Hold', SERVER_HOLD], ['Hold', SERVER_HOLD],
<<<<<<< HEAD
# sync with admin_statuses
=======
>>>>>>> staging
['ManualInzone', SERVER_MANUAL_INZONE], ['ManualInzone', SERVER_MANUAL_INZONE],
# [''], # [''],
['RenewProhibited', SERVER_RENEW_PROHIBITED], ['RenewProhibited', SERVER_RENEW_PROHIBITED],