Merge branch '109228160-deleteCandidate_status' into staging

This commit is contained in:
Stas 2015-12-02 17:34:13 +02:00
commit b50c84afc5

View file

@ -392,7 +392,7 @@ class Domain < ActiveRecord::Base
end end
def delete_candidateable? def delete_candidateable?
return false if delete_at > Time.zone.now return false if delete_at.to_date > Date.today
return false if statuses.include?(DomainStatus::DELETE_CANDIDATE) return false if statuses.include?(DomainStatus::DELETE_CANDIDATE)
return false if statuses.include?(DomainStatus::SERVER_DELETE_PROHIBITED) return false if statuses.include?(DomainStatus::SERVER_DELETE_PROHIBITED)
true true