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

Fix applying last_modified_by at asset update [SCI-10033]

Browse source
This commit is contained in:
Ivan Kljun 2024-02-07 15:31:13 +01:00
parent 8fa1c21e73
commit 5276faa74b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/asset_sync_controller.rb
View file

@ -37,8 +37,8 @@ class AssetSyncController < ApplicationController
end end
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
@asset.file.attach(io: request.body, filename: @asset.file.filename)
@asset.update(last_modified_by: current_user) @asset.update(last_modified_by: current_user)
@asset.file.attach(io: request.body, filename: @asset.file.filename)
log_activity(:edit) log_activity(:edit)
end end

2
app/controllers/assets_controller.rb
View file

@ -186,8 +186,8 @@ class AssetsController < ApplicationController
orig_file_name = @asset.file_name orig_file_name = @asset.file_name
return render_403 unless can_read_team?(@asset.team) return render_403 unless can_read_team?(@asset.team)
@asset.file.attach(io: params.require(:image), filename: orig_file_name)
@asset.last_modified_by = current_user @asset.last_modified_by = current_user
@asset.file.attach(io: params.require(:image), filename: orig_file_name)
@asset.save! @asset.save!
create_edit_image_activity(@asset, current_user, :finish_editing) create_edit_image_activity(@asset, current_user, :finish_editing)
# release previous image space # release previous image space

2
app/services/marvin_js_service.rb
View file

@ -39,8 +39,8 @@ class MarvinJsService
return unless attachment return unless attachment
file = generate_image(params) file = generate_image(params)
attach_file(attachment, file, params)
asset.update(last_modified_by: current_user) if asset.is_a?(Asset) asset.update(last_modified_by: current_user) if asset.is_a?(Asset)
attach_file(attachment, file, params)
asset.post_process_file if asset.instance_of?(Asset) asset.post_process_file if asset.instance_of?(Asset)
asset asset
end end