Merge branch '106735814-legal-documents-not-in-log-tables' into staging

This commit is contained in:
Vladimir Krylov 2015-11-16 17:15:41 +02:00
commit d471cb46db
2 changed files with 9 additions and 8 deletions

View file

@ -56,10 +56,6 @@ class Epp::DomainsController < EppController
authorize! :update, @domain, @password
begin
if @domain.update(params[:parsed_frame], current_user)
@domain.attach_legal_document(Epp::Domain.parse_legal_document_from_frame(params[:parsed_frame]))
@domain.save(validate: false)
if @domain.epp_pending_update.present?
render_epp_response '/epp/domains/success_pending'
else
@ -80,9 +76,6 @@ class Epp::DomainsController < EppController
handle_errors(@domain) and return unless @domain.can_be_deleted?
@domain.attach_legal_document(Epp::Domain.parse_legal_document_from_frame(params[:parsed_frame]))
@domain.save(validate: false)
if @domain.epp_destroy(params[:parsed_frame], current_user.id)
if @domain.epp_pending_delete.present?
render_epp_response '/epp/domains/success_pending'