Merge branch 'master' into improve-registrant-area

This commit is contained in:
Artur Beljajev 2018-09-18 13:04:35 +03:00
commit 1b16c92835
10 changed files with 144 additions and 25 deletions

View file

@ -9,7 +9,7 @@ class Epp::PollsController < EppController
private
def req_poll
@message = current_user.queued_messages.last
@message = current_user.queued_messages.order('created_at DESC').take
render_epp_response 'epp/poll/poll_no_messages' and return unless @message
if @message.attached_obj_type && @message.attached_obj_id

View file

@ -1,5 +1,5 @@
class Registrant::DomainDeleteConfirmsController < RegistrantController
skip_before_action :authenticate_user!, only: [:show, :update]
skip_before_action :authenticate_registrant_user!, only: [:show, :update]
skip_authorization_check only: [:show, :update]
def show

View file

@ -1,5 +1,5 @@
class Registrant::DomainUpdateConfirmsController < RegistrantController
skip_before_action :authenticate_user!, only: %i[show update]
skip_before_action :authenticate_registrant_user!, only: %i[show update]
skip_authorization_check only: %i[show update]
def show

View file

@ -115,7 +115,7 @@ class Registrar
sign_in(:registrar_user, @user)
flash[:notice] = t(:welcome)
flash.keep(:notice)
render js: "window.location = '#{registrar_root_url}'"
render js: "window.location = '#{after_sign_in_path_for(@user)}'"
when 'NOT_VALID'
render json: { message: t(:user_signature_is_invalid) }, status: :bad_request
when 'EXPIRED_TRANSACTION'