scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-31 03:59:51 +08:00
Code Issues Projects Releases Packages Wiki Activity

Refactor asset value methods

Browse source
This commit is contained in:
Urban Rotnik 2019-12-10 13:11:50 +01:00
parent 82b93bf9a4
commit 5055490a23
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/inventory_cells_controller.rb
View file

@ -69,7 +69,7 @@ module Api
end
params.require(:data).require(:attributes).require(:column_id)
params.require(:data).require(:attributes).require(:value)
params[:data][:attributes].permit!.to_h
params[:data][:attributes]
end
def update_inventory_cell_params

18
app/models/repository_asset_value.rb
View file

@ -35,12 +35,10 @@ class RepositoryAssetValue < ApplicationRecord
def update_data!(new_data, user)
destroy! && return if new_data == '-1'
if new_data.is_a?(Hash) && new_data[:file_data]
asset.file.attach(io: StringIO.new(Base64.decode64(new_data[:file_data].split(',')[1])),
filename: new_data[:file_name])
else
# new_data is direct_upload_token
if new_data.is_a?(String) # assume it's a signed_id_token
asset.file.attach(new_data)
elsif new_data[:file_data]
asset.file.attach(io: StringIO.new(Base64.decode64(new_data[:file_data])), filename: new_data[:file_name])
end
asset.last_modified_by = user
@ -53,14 +51,10 @@ class RepositoryAssetValue < ApplicationRecord
team = value.repository_cell.repository_column.repository.team
value.asset = Asset.create!(created_by: value.created_by, last_modified_by: value.created_by, team: team)
if payload.is_a?(Hash) && payload[:file_data]
value.asset.file.attach(
io: StringIO.new(Base64.decode64(payload[:file_data].split(',')[1])),
filename: payload[:file_name]
)
else
# payload is direct_upload_token
if payload.is_a?(String) # assume it's a signed_id_token
value.asset.file.attach(payload)
elsif payload[:file_data]
value.asset.file.attach(io: StringIO.new(Base64.decode64(payload[:file_data])), filename: payload[:file_name])
end
value.asset.post_process_file(team)