scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-08 21:06:24 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2219 from okriuchykhin/ok_SCI_4071

Browse source 
Improve handling of file links for local storage [SCI-4071]
This commit is contained in:
Alex Kriuchykhin 2019-11-20 15:08:21 +01:00 • committed by GitHub
commit aaef56e82b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/active_storage/custom_base_controller.rb
View file

@ -4,9 +4,5 @@
module ActiveStorage module ActiveStorage
class CustomBaseController < ApplicationController class CustomBaseController < ApplicationController
include ActiveStorage::SetCurrent include ActiveStorage::SetCurrent
before_action do
ActiveStorage::Current.host = request.base_url
end
end end
end end

1
app/controllers/marvin_js_assets_controller.rb
View file

@ -2,6 +2,7 @@
class MarvinJsAssetsController < ApplicationController class MarvinJsAssetsController < ApplicationController
include MarvinJsActions include MarvinJsActions
include ActiveStorage::SetCurrent
before_action :load_vars, except: :create before_action :load_vars, except: :create
before_action :load_create_vars, only: :create before_action :load_create_vars, only: :create

1
app/controllers/tiny_mce_assets_controller.rb
View file

@ -2,6 +2,7 @@
class TinyMceAssetsController < ApplicationController class TinyMceAssetsController < ApplicationController
include MarvinJsActions include MarvinJsActions
include ActiveStorage::SetCurrent
before_action :load_vars, only: %i(marvinjs_show marvinjs_update download) before_action :load_vars, only: %i(marvinjs_show marvinjs_update download)