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

Merge pull request #2119 from aignatov-bio/ai-sci-fix-marvin-js-preview

Browse source 
Fix marvin JS preview
This commit is contained in:
aignatov-bio 2019-10-03 11:59:19 +02:00 committed by GitHub
commit afecc3fd0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/assets_controller.rb
View file

@ -18,8 +18,7 @@ class AssetsController < ApplicationController
before_action :check_edit_permission, only: :edit
def file_preview
file_type = 'previewable' if @asset.previewable?
file_type ||= @asset.file.metadata[:asset_type]
file_type = @asset.file.metadata[:asset_type] || (@asset.previewable? ? 'previewable' : false)
response_json = {
'id' => @asset.id,
'type' => file_type,