scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6247 from aignatov-bio/ai-sci-9260-fix-wopi

Browse source 
Fix wopi and pdf preview [SCI-9260]
This commit is contained in:
aignatov-bio 2023-09-19 13:17:42 +02:00 committed by GitHub
parent bde1434923 370508304b
commit 5626bdef4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/assets_controller.rb
View file

@ -252,7 +252,7 @@ class AssetsController < ApplicationController
edit_url = edit_asset_url(step_asset.asset_id)
elsif params[:element_type] == 'Result'
my_module = MyModule.find(params[:element_id].to_i)
my_module = Result.find(params[:element_id].to_i).my_module
render_403 and return unless can_manage_my_module?(my_module)
# First create result and then the asset

3
app/views/results/index.html.erb
View file

@ -29,5 +29,6 @@
<%= javascript_include_tag "handsontable.full" %>
<%= render partial: "shared/formulas_libraries" %>
<%= render 'shared/tiny_mce_packs' %>
<%= javascript_include_tag 'pdf_js' %>
<%= stylesheet_link_tag 'pdf_js_styles' %>
<%= javascript_include_tag 'vue_results' %>