From f4f0bc706a86a99693de7e086062244eaba4be97 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Fri, 25 Sep 2020 08:38:38 +0200 Subject: [PATCH] Fix step deletion --- app/controllers/api/v1/assets_controller.rb | 4 ++-- app/controllers/api/v1/results_controller.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/api/v1/assets_controller.rb b/app/controllers/api/v1/assets_controller.rb index 358e49708..140fe992a 100644 --- a/app/controllers/api/v1/assets_controller.rb +++ b/app/controllers/api/v1/assets_controller.rb @@ -23,14 +23,14 @@ module Api raise PermissionError.new(Asset, :create) unless can_manage_protocol_in_module?(@protocol) if @form_multipart_upload - asset = @step.assets.new(asset_params) + asset = @step.assets.new(asset_params.merge({ team_id: @team.id })) else blob = ActiveStorage::Blob.create_after_upload!( io: StringIO.new(Base64.decode64(asset_params[:file_data])), filename: asset_params[:file_name], content_type: asset_params[:file_type] ) - asset = @step.assets.new(file: blob) + asset = @step.assets.new(file: blob, team: @team) end asset.save!(context: :on_api_upload) diff --git a/app/controllers/api/v1/results_controller.rb b/app/controllers/api/v1/results_controller.rb index 6d6bcde2d..0760ed813 100644 --- a/app/controllers/api/v1/results_controller.rb +++ b/app/controllers/api/v1/results_controller.rb @@ -104,10 +104,10 @@ module Api Result.transaction do @result = @task.results.create!(result_params.merge(user_id: current_user.id)) if @form_multipart_upload - asset = Asset.create!(result_file_params) + asset = Asset.create!(result_file_params.merge({ team_id: @team.id })) else blob = create_blob_from_params - asset = Asset.create!(file: blob) + asset = Asset.create!(file: blob, team: @team) end ResultAsset.create!(asset: asset, result: @result) end