scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-10 14:16:28 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6305 from ivanscinote/SCI-9349-a-new-office-file-added-to-existing-result-will-be-created-in-a-new-result

Browse source 
Fix bug for  adding Office files to a result [SCI-9349]
This commit is contained in:
Martin Artnik 2023-09-27 12:45:36 +02:00 • committed by GitHub
commit a8bdbc5faa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/assets_controller.rb
View file

@ -252,14 +252,11 @@ class AssetsController < ApplicationController
edit_url = edit_asset_url(step_asset.asset_id)
elsif params[:element_type] == 'Result'
my_module = Result.find(params[:element_id].to_i).my_module
render_403 and return unless can_manage_my_module?(my_module)
result = Result.find(params[:element_id].to_i)
render_403 and return unless can_manage_result?(result)
# First create result and then the asset
result = Result.create(name: asset.file_name,
my_module: my_module,
user: current_user)
result_asset = ResultAsset.create!(result: result, asset: asset)
asset.update!(view_mode: result.assets_view_mode)
edit_url = edit_asset_url(result_asset.asset_id)
else