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

Merge pull request #2115 from urbanrotnik/ur-sci-3947-local-storage

Browse source 
Fix for disk storage [SCI-3947]
This commit is contained in:
Urban Rotnik 2019-10-03 16:28:09 +02:00 • committed by GitHub
commit 09e6545f30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/active_storage/blobs_controller.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
module ActiveStorage module ActiveStorage
class BlobsController < BaseController class BlobsController < CustomBaseController
include ActiveStorage::SetBlob include ActiveStorage::SetBlob
include ActiveStorage::CheckBlobPermissions include ActiveStorage::CheckBlobPermissions

2
app/controllers/active_storage/base_controller.rb → app/controllers/active_storage/custom_base_controller.rb
View file

@ -2,7 +2,7 @@
# The base controller for all ActiveStorage controllers. # The base controller for all ActiveStorage controllers.
module ActiveStorage module ActiveStorage
class BaseController < ApplicationController class CustomBaseController < ApplicationController
include ActiveStorage::SetCurrent include ActiveStorage::SetCurrent
before_action do before_action do

2
app/controllers/active_storage/representations_controller.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
module ActiveStorage module ActiveStorage
class RepresentationsController < BaseController class RepresentationsController < CustomBaseController
include ActiveStorage::SetBlob include ActiveStorage::SetBlob
include ActiveStorage::CheckBlobPermissions include ActiveStorage::CheckBlobPermissions

13
app/services/reports/docx/private_methods.rb
View file

@ -98,7 +98,7 @@ module Reports::Docx::PrivateMethods
image = TinyMceAsset.find_by(id: Base62.decode(elem.attributes['data-mce-token'].value)) image = TinyMceAsset.find_by(id: Base62.decode(elem.attributes['data-mce-token'].value))
next unless image next unless image
image_path = image_path(image) image_path = image_path(image.image)
dimension = FastImage.size(image_path) dimension = FastImage.size(image_path)
style = image_styling(elem, dimension) style = image_styling(elem, dimension)
@ -204,7 +204,7 @@ module Reports::Docx::PrivateMethods
def asset_image_preparing(asset) def asset_image_preparing(asset)
return unless asset return unless asset
image_path = image_path(asset) image_path = image_path(asset.file)
dimension = FastImage.size(image_path) dimension = FastImage.size(image_path)
x = dimension[0] x = dimension[0]
@ -292,13 +292,8 @@ module Reports::Docx::PrivateMethods
} }
end end
def image_path(asset) def image_path(attachment)
image = if asset.class == Asset attachment.service_url
asset.file
else
asset.image
end
image.service_url
end end
def calculate_color_hsp(color) def calculate_color_hsp(color)

4
config/storage.yml
View file

@ -1,9 +1,9 @@
test: test:
service: Disk service: CustomDisk
root: <%= Rails.root.join("tmp/storage") %> root: <%= Rails.root.join("tmp/storage") %>
local: local:
service: Disk service: CustomDisk
root: <%= Rails.root.join("storage") %> root: <%= Rails.root.join("storage") %>
amazon: amazon:

14
lib/active_storage/service/custom_disk_service.rb Normal file
View file

@ -0,0 +1,14 @@
# frozen_string_literal: true
require 'active_storage/service/disk_service'
module ActiveStorage
class Service::CustomDiskService < Service::DiskService
def current_host
host = ActiveStorage::Current.host
host ||= Rails.application.secrets.mail_server_url
host = "http://#{host}" unless host.match?(/^http/)
host
end
end
end