Merge remote-tracking branch 'origin/master' into 110687814-update_values

# Conflicts:
#	app/models/epp/domain.rb
This commit is contained in:
Stas 2016-04-08 18:11:47 +03:00
commit ae3467a8b1
304 changed files with 3676 additions and 426401 deletions

View file

@ -19,6 +19,8 @@ class Epp::ContactsController < EppController
authorize! :create, Epp::Contact
@contact = Epp::Contact.new(params[:parsed_frame], current_user.registrar)
@contact.add_legal_file_to_new(params[:parsed_frame])
if @contact.save
render_epp_response '/epp/contacts/create'
else
@ -39,7 +41,7 @@ class Epp::ContactsController < EppController
def delete
authorize! :delete, @contact, @password
if @contact.destroy_and_clean
if @contact.destroy_and_clean(params[:parsed_frame])
render_epp_response '/epp/contacts/delete'
else
handle_errors(@contact)