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

fixed storing lockable statuses

Browse source
This commit is contained in:
Oleg Hasjanov 2021-04-07 20:10:10 +03:00
parent 9c0018d6fe
commit 3f8a99d8ca
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,9 +53,8 @@ module Admin
dp = ignore_empty_statuses dp = ignore_empty_statuses
@domain.is_admin = true @domain.is_admin = true
@domain.admin_status_update dp[:statuses] @domain.admin_status_update dp[:statuses]
if @domain.update(dp) if @domain.update(dp)
# @domain.admin_store_statuses_history = @domain.statuses
# @domain.save
flash[:notice] = I18n.t('domain_updated') flash[:notice] = I18n.t('domain_updated')
redirect_to [:admin, @domain] redirect_to [:admin, @domain]
else else

1
app/models/concerns/domain/registry_lockable.rb
View file

@ -40,6 +40,7 @@ module Domain::RegistryLockable
end end
self.locked_by_registrant_at = nil self.locked_by_registrant_at = nil
self.statuses = admin_store_statuses_history || [] self.statuses = admin_store_statuses_history || []
admin_store_statuses_history = nil
alert_registrar_lock_changes!(lock: false) alert_registrar_lock_changes!(lock: false)
save! save!

10
app/models/domain.rb
View file

@ -557,9 +557,17 @@ class Domain < ApplicationRecord
# special handling for admin changing status # special handling for admin changing status
def admin_status_update(update) def admin_status_update(update)
lock_statuses = [DomainStatus::SERVER_UPDATE_PROHIBITED,
DomainStatus::SERVER_DELETE_PROHIBITED,
DomainStatus::SERVER_TRANSFER_PROHIBITED]
# check for deleted status # check for deleted status
update(admin_store_statuses_history: update) unless locked_by_registrant?
update(admin_store_statuses_history: update) if locked_by_registrant?
result = update.reject { |status| lock_statuses.include? status }
update(admin_store_statuses_history: result)
end
statuses.each do |s| statuses.each do |s|
unless update.include? s unless update.include? s
case s case s