Multiple fixes for prod
This commit is contained in:
@@ -96,26 +96,29 @@ class ApplicationController < BaseController
|
||||
logger.info "A JavaScript error has occurred on #{params[:location]}:#{params[:lineNumber]}: #{params[:message]}"
|
||||
|
||||
if Rails.env.preview? || Rails.env.production?
|
||||
request_info = {
|
||||
'remote_ip' => request.remote_ip,
|
||||
'uuid' => request.uuid,
|
||||
'original_url' => request.original_url,
|
||||
'env' => Hash.new
|
||||
}
|
||||
request.env.each do |key, value|
|
||||
request_info['env'][key.to_s] = value.to_s
|
||||
end
|
||||
# don't worry about bots
|
||||
unless request.user_agent =~ /Googlebot/
|
||||
request_info = {
|
||||
'remote_ip' => request.remote_ip,
|
||||
'uuid' => request.uuid,
|
||||
'original_url' => request.original_url,
|
||||
'env' => Hash.new
|
||||
}
|
||||
request.env.each do |key, value|
|
||||
request_info['env'][key.to_s] = value.to_s
|
||||
end
|
||||
|
||||
send_mail(:error_report,
|
||||
"A JavaScript error has occurred",
|
||||
report,
|
||||
params[:message],
|
||||
nil,
|
||||
request_info,
|
||||
params,
|
||||
current_user,
|
||||
Time.now.strftime("%d/%m/%Y %H:%M")
|
||||
)
|
||||
send_mail(:error_report,
|
||||
"A JavaScript error has occurred",
|
||||
report,
|
||||
params[:message],
|
||||
nil,
|
||||
request_info,
|
||||
params,
|
||||
current_user,
|
||||
Time.now.strftime("%d/%m/%Y %H:%M")
|
||||
)
|
||||
end
|
||||
end
|
||||
rescue Exception => exception2
|
||||
logger.info exception2.to_s
|
||||
|
||||
@@ -1095,7 +1095,7 @@ class ConferenceAdministrationController < ApplicationController
|
||||
do_404
|
||||
end
|
||||
|
||||
return true
|
||||
return nil
|
||||
end
|
||||
|
||||
def admin_update_housing
|
||||
@@ -1155,7 +1155,7 @@ class ConferenceAdministrationController < ApplicationController
|
||||
)
|
||||
end
|
||||
redirect_to administration_step_path(@this_conference.slug, :broadcast_sent)
|
||||
return true
|
||||
return nil
|
||||
elsif params[:button] == 'preview'
|
||||
@send_to_count = view_context.broadcast_to(@send_to).size
|
||||
@broadcast_step = :preview
|
||||
@@ -1170,7 +1170,7 @@ class ConferenceAdministrationController < ApplicationController
|
||||
)
|
||||
@send_to_count = view_context.broadcast_to(@send_to).size
|
||||
end
|
||||
return false
|
||||
return true
|
||||
end
|
||||
|
||||
def admin_update_locations
|
||||
|
||||
Reference in New Issue
Block a user