zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-19 18:59:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '104525314-domain-object-states' into staging

Browse source
This commit is contained in:
Matt Farnsworth 2015-11-20 16:55:11 +02:00
commit d78fa578d1
2 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/domain.rb
View file

@ -694,7 +694,7 @@ class Domain < ActiveRecord::Base
def admin_status_update(update) def admin_status_update(update)
# check for deleted status # check for deleted status
statuses.each do |s| statuses.each do |s|
unless update.includes? s unless update.include? s
case s case s
when DomainStatus::PENDING_DELETE when DomainStatus::PENDING_DELETE
self.delete_at = nil self.delete_at = nil

4
app/views/admin/domains/form/_pending_delete.haml
View file

@ -2,7 +2,3 @@
= link_to(t(:accept_delete), admin_domain_pending_delete_path(f.object.id, f.object.id), = link_to(t(:accept_delete), admin_domain_pending_delete_path(f.object.id, f.object.id),
method: :patch, data: { confirm: t(:are_you_sure) }, method: :patch, data: { confirm: t(:are_you_sure) },
class: 'btn btn-danger btn-xs') class: 'btn btn-danger btn-xs')
= link_to(t(:reject_delete), admin_domain_pending_delete_path(f.object.id, f.object.id),
method: :delete, data: { confirm: t(:are_you_sure) },
class: 'btn btn-danger btn-xs')