zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 12:08:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into refactor-messages

Browse source 
# Conflicts:
#	app/views/epp/poll/poll_req.xml.builder
#	test/fixtures/messages.yml
#	test/integration/epp/poll_test.rb
This commit is contained in:
Artur Beljajev 2018-09-17 13:21:33 +03:00
commit 1679e4b72e
8 changed files with 55 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/registrant/domain_delete_confirms_controller.rb
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

2
app/controllers/registrant/domain_update_confirms_controller.rb
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

2
app/controllers/registrar/sessions_controller.rb
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'

2
app/views/epp/poll/poll_req.xml.builder
View file

@ -5,7 +5,7 @@ xml.epp_head do
end
xml.tag!('msgQ', 'count' => current_user.unread_notifications.count, 'id' => @notification.id) do
xml.qDate @notification.created_at.try(:iso8601)
xml.qDate @notification.created_at.utc.xmlschema
xml.msg @notification.text
end