zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-06 01:35:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '104525314-domain-object-states' into staging to apply bug fixes

Browse source
This commit is contained in:
Matt Farnsworth 2015-11-05 13:12:08 +02:00
commit d72b3518b2
4 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/domains_controller.rb
View file

@ -46,6 +46,7 @@ class Admin::DomainsController < AdminController
def update
dp = ignore_empty_statuses
@domain.is_admin = true
if @domain.update(dp)
flash[:notice] = I18n.t('domain_updated')

2
app/models/domain.rb
View file

@ -401,7 +401,7 @@ class Domain < ActiveRecord::Base
def clean_pendings!
preclean_pendings
self.pending_json = {}
statuses.delete[DomainStatus::PENDING_DELETE_CONFIRMATION]
statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
statuses.delete(DomainStatus::PENDING_UPDATE)
statuses.delete(DomainStatus::PENDING_DELETE)
status_notes[DomainStatus::PENDING_UPDATE] = ''

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

@ -513,7 +513,7 @@ class Epp::Domain < Domain
return false unless valid?
if Setting.request_confirmation_on_domain_deletion_enabled &&
frame.css('delete').attr('verified').to_s.downcase != 'yes'
frame.css('delete').children.css('delete').attr('verified').to_s.downcase != 'yes'
registrant_verification_asked!(frame.to_s, user_id)
self.deliver_emails = true # turn on email delivery for epp