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

Fix file format bug (#1569)

Browse source
This commit is contained in:
aignatov-bio 2019-03-19 11:06:36 +01:00 committed by GitHub
parent b6480b04a9
commit a0a3c4b97f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/sitewide/file_preview.js.erb
View file

@ -18,14 +18,8 @@
}); });
} }
<<<<<<< HEAD:app/assets/javascripts/sitewide/file_preview.js.erb
function initImageEditor(data) {
// var ImageEditor = require('tui-image-editor');
=======
function initImageEditor(data) { function initImageEditor(data) {
var imageEditor; var imageEditor;
>>>>>>> 50ccdbc6... Add workaround for image caching in fabric js [SCI-2855]:app/assets/javascripts/sitewide/file_preview.js
var blackTheme = { var blackTheme = {
'common.bi.image': '', 'common.bi.image': '',
'common.bisize.width': '0', 'common.bisize.width': '0',

3
app/controllers/assets_controller.rb
View file

@ -148,7 +148,8 @@ class AssetsController < ApplicationController
@asset = Asset.find(params[:id]) @asset = Asset.find(params[:id])
return render_403 unless can_read_team?(@asset.team) return render_403 unless can_read_team?(@asset.team)
image_file = Paperclip.io_adapters.for(params[:image]) image_file = Paperclip.io_adapters.for(params[:image])
image_file.original_filename = @asset.file_file_name image_format = image_file.content_type.split('/')[1]
image_file.original_filename = @asset.file_file_name.ext(image_format)
@asset.file = image_file @asset.file = image_file
@asset.save! @asset.save!
# Post process file here # Post process file here