mirror of
https://github.com/internetee/registry.git
synced 2025-08-05 17:28:18 +02:00
Merge branch '104525314-domain-object-states' into staging to apply bug fixes
This commit is contained in:
commit
d72b3518b2
4 changed files with 5 additions and 9 deletions
|
@ -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')
|
||||
|
|
|
@ -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] = ''
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue