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

Add new element, error messages, fix tests #2565

Browse source
This commit is contained in:
Martin Lensment 2015-07-09 17:57:33 +03:00
parent 94adc9496f
commit bfdabaacf3
7 changed files with 77 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/models/domain.rb
View file

@ -96,8 +96,17 @@ class Domain < ActiveRecord::Base
validate :validate_reservation
def validate_reservation
return if persisted?
return if !in_reserved_list? || reserved_pw == auth_info
errors.add(:base, :domain_is_reserved_and_requires_correct_auth_info)
return if !in_reserved_list?
if reserved_pw.blank?
errors.add(:base, :required_parameter_missing_reserved)
return false
end
if ReservedDomain.pw_for(name) != reserved_pw
errors.add(:base, :invalid_auth_information_reserved)
return false
end
end
validates :nameservers, object_count: {
@ -149,7 +158,7 @@ class Domain < ActiveRecord::Base
end
attr_accessor :registrant_typeahead, :update_me, :deliver_emails,
:epp_pending_update, :epp_pending_delete
:epp_pending_update, :epp_pending_delete, :reserved_pw
def subordinate_nameservers
nameservers.select { |x| x.hostname.end_with?(name) }
@ -263,11 +272,7 @@ class Domain < ActiveRecord::Base
end
def in_reserved_list?
reserved_pw.present?
end
def reserved_pw
ReservedDomain.pw_for(name)
ReservedDomain.pw_for(name).present?
end
def pending_transfer