scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-08 22:24:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix uploading of result assets

Browse source
This commit is contained in:
Jure Grabnar 2016-08-10 13:43:27 +02:00
parent c801e7b7e3
commit d69195a4f6
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/result_assets_controller.rb
View file

@ -53,13 +53,13 @@ class ResultAssetsController < ApplicationController
respond_to do |format| respond_to do |format|
if (@result.save and @asset.save) then if (@result.save and @asset.save) then
# Post process file here # Post process file here
@asset.post_process_file(@my_module.project.organization) @asset.post_process_file(@my_module.experiment.project.organization)
# Generate activity # Generate activity
Activity.create( Activity.create(
type_of: :add_result, type_of: :add_result,
user: current_user, user: current_user,
project: @my_module.project, project: @my_module.experiment.project,
my_module: @my_module, my_module: @my_module,
message: t( message: t(
"activities.add_asset_result", "activities.add_asset_result",
@ -123,7 +123,7 @@ class ResultAssetsController < ApplicationController
if saved if saved
Activity.create( Activity.create(
type_of: :archive_result, type_of: :archive_result,
project: @my_module.project, project: @my_module.experiment.project,
my_module: @my_module, my_module: @my_module,
user: current_user, user: current_user,
message: t( message: t(
@ -144,7 +144,7 @@ class ResultAssetsController < ApplicationController
# Release organization's space taken due to # Release organization's space taken due to
# previous asset being removed # previous asset being removed
org = @result.my_module.project.organization org = @result.my_module.experiment.project.organization
org.release_space(previous_size) org.release_space(previous_size)
org.save org.save
@ -156,7 +156,7 @@ class ResultAssetsController < ApplicationController
Activity.create( Activity.create(
type_of: :edit_result, type_of: :edit_result,
user: current_user, user: current_user,
project: @my_module.project, project: @my_module.experiment.project,
my_module: @my_module, my_module: @my_module,
message: t( message: t(
"activities.edit_asset_result", "activities.edit_asset_result",