rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity

bug fix: not to force https in env production for root_url helper

Browse Source
This commit is contained in:
cyril 2016-09-28 13:58:22 +02:00
parent 99801bb02a
commit a0fef8d046
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base
end
def default_url_options
Rails.env.production? ? { protocol: 'https' } : {}
{ :host => Rails.application.secrets.default_host, protocol: Rails.application.secrets.default_protocol }
end
def permission_denied

2
app/views/api/notifications/_notify_admin_export_complete.json.jbuilder
View File

@ -2,5 +2,5 @@ json.title notification.notification_type
json.description t('.export')+' '+
t(".#{notification.attached_object.category}_#{notification.attached_object.export_type}")+' '+
t('.is_over')+' '+
link_to( t('.download_here'), "#{root_url}api/exports/#{notification.attached_object.id}/download" )+'.'
link_to( t('.download_here'), "api/exports/#{notification.attached_object.id}/download" )+'.'
json.url notification_url(notification, format: :json)