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

Merge pull request #2871 from urbanrotnik/ur-sci-4849-fix-step-deletion

Browse source 
Fix step deletion [SCI-4849]
This commit is contained in:
Alex Kriuchykhin 2020-09-25 11:31:04 +02:00 committed by GitHub
commit a7392a38d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/api/v1/assets_controller.rb
View file

@ -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)

4
app/controllers/api/v1/results_controller.rb
View file

@ -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