scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-23 13:34:57 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1640 from okriuchykhin/ok_SCI_3281_v2

Browse source 
Fix activity creation for editing wopi file in protocol repository [SCI-3281]
This commit is contained in:
Alex Kriuchykhin 2019-04-03 21:14:36 +02:00 • committed by GitHub
commit d8ce4d4a91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/utilities/wopi_util.rb
View file

@ -79,24 +79,28 @@ module WopiUtil
t('activities.wupi_file_editing.finished')
end
if @assoc.class == Step
type_of = :edit_wopi_file_on_step_in_repository
default_step_items =
{ step: @asset.step.id,
step_position: { id: @asset.step.id, value_for: 'position_plus_one' },
asset_name: { id: @asset.id, value_for: 'file_file_name' },
action: action }
message_items = { protocol: @protocol.id }
if @protocol.in_module?
project = @protocol.my_module.experiment.project
team = project.team
type_of = :edit_wopi_file_on_step
message_items = { my_module: @protocol.my_module.id }
else
type_of = :edit_wopi_file_on_step_in_repository
project = nil
team = @protocol.team
message_items = { protocol: @protocol.id }
end
message_items = default_step_items.merge(message_items)
Activities::CreateActivityService
.call(activity_type: type_of,
owner: current_user,
subject: @protocol,
team: @protocol.my_module.experiment.project.team,
team: team,
project: project,
message_items: message_items)
elsif @assoc.class == Result