Story #109086524 - revert to allow merge, changes fixed on branch for story 109367694

This commit is contained in:
Matt Farnsworth 2015-12-14 11:45:54 +02:00
parent 176bd33ad5
commit 6c90d5825b

View file

@ -7,7 +7,6 @@ class Epp::Domain < Domain
before_validation :manage_permissions
def manage_permissions
return if is_admin # this bad hack for 109086524, refactor later
return unless update_prohibited? || delete_prohibited?
add_epp_error('2304', nil, nil, I18n.t(:object_status_prohibits_operation))
false
@ -507,9 +506,7 @@ class Epp::Domain < Domain
frame = Nokogiri::XML(pending_json['frame'])
statuses.delete(DomainStatus::PENDING_UPDATE)
yield(self) if block_given? # need to skip statuses check here
save
PaperTrail.whodunnit = user
return unless update(frame, user, false)
clean_pendings!
self.deliver_emails = true # turn on email delivery