scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-31 04:32:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7631 from artoscinote/ma_SCI_10770

Browse source 
Fix asset sync conflict handling for results [SCI-10770]
This commit is contained in:
Martin Artnik 2024-06-05 14:52:18 +02:00 committed by GitHub
commit 84605cf0b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/asset_sync_controller.rb
View file

@ -141,7 +141,7 @@ class AssetSyncController < ApplicationController
project = assoc.protocol.in_module? ? assoc.my_module.project : nil
when Result
type_of = :result_file_added
message_items = { result: assoc }
message_items = { result: assoc.id }
project = assoc.my_module.project
end