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

Merge branch 'ok_SCI_2765' of https://github.com/okriuchykhin/scinote-web into core-api

Browse source 
Conflicts:
	app/serializers/api/v1/repository_asset_value_serializer.rb
This commit is contained in:
Luka Murn 2018-10-16 13:17:14 +02:00
commit 3126f7c238
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/serializers/api/v1/repository_asset_value_serializer.rb
View file

@ -23,8 +23,6 @@ module Api
elsif object.asset&.file&.is_stored_on_s3? elsif object.asset&.file&.is_stored_on_s3?
object.asset.presigned_url(download: true) object.asset.presigned_url(download: true)
else else
# TODO
# separate api endpoint for local files download is needed
object.asset.file.url object.asset.file.url
end end
end end