Merge branch '115595167-records_match' into staging

This commit is contained in:
Stas 2016-04-15 13:08:00 +03:00
commit 4421e2beb2
4 changed files with 25 additions and 2 deletions

View file

@ -55,6 +55,10 @@ class ApplicationController < ActionController::Base
end
end
def info_for_paper_trail
{ uuid: request.uuid }
end
def user_for_paper_trail
user_log_str(current_user)
end

View file

@ -371,7 +371,8 @@ class EppController < ApplicationController
response: @response,
api_user_name: @api_user.try(:username) || current_user.try(:username) || 'api-public',
api_user_registrar: @api_user.try(:registrar).try(:to_s) || current_user.try(:registrar).try(:to_s),
ip: request.ip
ip: request.ip,
uuid: request.uuid
})
end
# rubocop: enable Metrics/CyclomaticComplexity