diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index 5fef41b75..9330e153a 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb @@ -218,7 +218,7 @@ class AssetsController < ApplicationController log_step_activity( :task_step_file_deleted, @assoc, - @assoc.my_module.experiment.project, + @assoc.my_module.project, my_module: @assoc.my_module.id, file: @asset.file_name ) @@ -298,7 +298,7 @@ class AssetsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: step.protocol, - team: current_team, + team: step.protocol.team, project: project, message_items: message_items) end @@ -308,8 +308,8 @@ class AssetsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: result, - team: result.my_module.experiment.project.team, - project: result.my_module.experiment.project, + team: result.my_module.team, + project: result.my_module.project, message_items: { result: result.id, type_of_result: t('activities.result_type.text') diff --git a/app/controllers/concerns/assets_actions.rb b/app/controllers/concerns/assets_actions.rb index a7c769730..9971d2433 100644 --- a/app/controllers/concerns/assets_actions.rb +++ b/app/controllers/concerns/assets_actions.rb @@ -41,8 +41,8 @@ module AssetsActions .call(activity_type: :edit_image_on_result, owner: current_user, subject: asset.result, - team: my_module.experiment.project.team, - project: my_module.experiment.project, + team: my_module.team, + project: my_module.project, message_items: { result: asset.result.id, asset_name: { id: asset.id, value_for: 'file_name' }, diff --git a/app/controllers/concerns/bio_eddie_actions.rb b/app/controllers/concerns/bio_eddie_actions.rb index 8926853f4..5905650dd 100644 --- a/app/controllers/concerns/bio_eddie_actions.rb +++ b/app/controllers/concerns/bio_eddie_actions.rb @@ -104,8 +104,8 @@ module BioEddieActions .call(activity_type: "#{activity}_molecule_on_result".to_sym, owner: current_user, subject: result, - team: my_module.experiment.project.team, - project: my_module.experiment.project, + team: my_module.team, + project: my_module.project, message_items: message_items) end end diff --git a/app/controllers/concerns/marvin_js_actions.rb b/app/controllers/concerns/marvin_js_actions.rb index a7711da89..981678c2a 100644 --- a/app/controllers/concerns/marvin_js_actions.rb +++ b/app/controllers/concerns/marvin_js_actions.rb @@ -118,8 +118,8 @@ module MarvinJsActions .call(activity_type: (activity + '_chemical_structure_on_result').to_sym, owner: current_user, subject: result, - team: my_module.experiment.project.team, - project: my_module.experiment.project, + team: my_module.team, + project: my_module.project, message_items: message_items) end @@ -137,8 +137,8 @@ module MarvinJsActions .call(activity_type: (activity + '_chemical_structure_on_task').to_sym, owner: current_user, subject: my_module, - team: my_module.experiment.project.team, - project: my_module.experiment.project, + team: my_module.team, + project: my_module.project, message_items: message_items) end diff --git a/app/controllers/experiments_controller.rb b/app/controllers/experiments_controller.rb index 07cd60704..671da0ae2 100644 --- a/app/controllers/experiments_controller.rb +++ b/app/controllers/experiments_controller.rb @@ -410,7 +410,7 @@ class ExperimentsController < ApplicationController Activities::CreateActivityService .call(activity_type: type_of, owner: current_user, - team: experiment.project.team, + team: experiment.team, project: experiment.project, subject: experiment, message_items: { experiment: experiment.id }) diff --git a/app/controllers/my_module_repositories_controller.rb b/app/controllers/my_module_repositories_controller.rb index 22d81c158..ce78d5469 100644 --- a/app/controllers/my_module_repositories_controller.rb +++ b/app/controllers/my_module_repositories_controller.rb @@ -135,7 +135,7 @@ class MyModuleRepositoriesController < ApplicationController activity_type: :export_inventory_items_assigned_to_task, owner: current_user, subject: @my_module, - team: current_team, + team: @repository.team, message_items: { my_module: @my_module.id, repository: @repository.id @@ -251,7 +251,7 @@ class MyModuleRepositoriesController < ApplicationController owner: current_user, subject: @my_module, team: @repository.team, - project: @my_module.experiment.project, + project: @my_module.project, message_items: { repository: @repository.id, repository_row: module_repository_row.repository_row_id, diff --git a/app/controllers/my_module_repository_snapshots_controller.rb b/app/controllers/my_module_repository_snapshots_controller.rb index 1159fc48a..c8644427c 100644 --- a/app/controllers/my_module_repository_snapshots_controller.rb +++ b/app/controllers/my_module_repository_snapshots_controller.rb @@ -114,7 +114,7 @@ class MyModuleRepositorySnapshotsController < ApplicationController activity_type: :export_inventory_snapshot_items_assigned_to_task, owner: current_user, subject: @my_module, - team: current_team, + team: @my_module.team, message_items: { my_module: @my_module.id, repository_snapshot: @repository_snapshot.id, diff --git a/app/controllers/my_module_tags_controller.rb b/app/controllers/my_module_tags_controller.rb index a62025545..0235505d5 100644 --- a/app/controllers/my_module_tags_controller.rb +++ b/app/controllers/my_module_tags_controller.rb @@ -70,9 +70,8 @@ class MyModuleTagsController < ApplicationController .call(activity_type: :add_task_tag, owner: current_user, subject: my_module, - project: - my_module.experiment.project, - team: current_team, + project: my_module.project, + team: my_module.team, message_items: { my_module: my_module.id, tag: @mt.tag.id @@ -95,9 +94,8 @@ class MyModuleTagsController < ApplicationController .call(activity_type: :remove_task_tag, owner: current_user, subject: @mt.my_module, - project: - @mt.my_module.experiment.project, - team: current_team, + project: @mt.my_module.project, + team: @mt.my_module.team, message_items: { my_module: @mt.my_module.id, tag: @mt.tag.id @@ -139,9 +137,8 @@ class MyModuleTagsController < ApplicationController .call(activity_type: :remove_task_tag, owner: current_user, subject: tag.my_module, - project: - tag.my_module.experiment.project, - team: current_team, + project: tag.my_module.project, + team: tag.my_module.team, message_items: { my_module: tag.my_module.id, tag: tag.tag.id diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index cce723427..c79e40e18 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -456,8 +456,8 @@ class MyModulesController < ApplicationController Activities::CreateActivityService .call(activity_type: type_of, owner: current_user, - team: my_module.experiment.project.team, - project: my_module.experiment.project, + team: my_module.team, + project: my_module.project, subject: my_module, message_items: message_items) end diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb index 04aaa2e02..f694015a6 100644 --- a/app/controllers/protocols_controller.rb +++ b/app/controllers/protocols_controller.rb @@ -622,7 +622,7 @@ class ProtocolsController < ApplicationController .call(activity_type: :import_protocol_in_repository, owner: current_user, subject: protocol, - team: current_team, + team: protocol.team, message_items: { protocol: protocol.id }) @@ -820,15 +820,15 @@ class ProtocolsController < ApplicationController file_name = 'protocols.eln' end - @protocols.each do |p| + @protocols.each do |protocol| if params[:my_module_id] my_module = MyModule.find(params[:my_module_id]) Activities::CreateActivityService .call(activity_type: :export_protocol_from_task, owner: current_user, - project: my_module.experiment.project, + project: my_module.project, subject: my_module, - team: current_team, + team: my_module.team, message_items: { my_module: params[:my_module_id].to_i }) @@ -836,10 +836,10 @@ class ProtocolsController < ApplicationController Activities::CreateActivityService .call(activity_type: :export_protocol_in_repository, owner: current_user, - subject: p, - team: current_team, + subject: protocol, + team: protocol.team, message_items: { - protocol: p.id + protocol: protocol.id }) end end @@ -1232,7 +1232,7 @@ class ProtocolsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: @protocol, - team: current_team, + team: @protocol.team, project: project, message_items: message_items) end diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 139502711..e68ec7dfd 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -521,7 +521,7 @@ class RepositoriesController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: @repository, - team: current_team, + team: @repository.team, message_items: message_items) end end diff --git a/app/controllers/repository_columns_controller.rb b/app/controllers/repository_columns_controller.rb index 254dd5d21..811b724e3 100644 --- a/app/controllers/repository_columns_controller.rb +++ b/app/controllers/repository_columns_controller.rb @@ -167,7 +167,7 @@ class RepositoryColumnsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: @repository, - team: current_team, + team: @repository.team, message_items: { repository_column: @repository_column.id, repository: @repository.id diff --git a/app/controllers/repository_rows_controller.rb b/app/controllers/repository_rows_controller.rb index da8ec005d..35cfaca3f 100644 --- a/app/controllers/repository_rows_controller.rb +++ b/app/controllers/repository_rows_controller.rb @@ -432,7 +432,7 @@ class RepositoryRowsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: repository_row, - team: current_team, + team: @repository.team, message_items: { repository_row: repository_row.id, repository: @repository.id diff --git a/app/controllers/result_assets_controller.rb b/app/controllers/result_assets_controller.rb index bfd636875..1045e113c 100644 --- a/app/controllers/result_assets_controller.rb +++ b/app/controllers/result_assets_controller.rb @@ -191,8 +191,8 @@ class ResultAssetsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: result, - team: @my_module.experiment.project.team, - project: @my_module.experiment.project, + team: @my_module.team, + project: @my_module.project, message_items: { result: result.id, type_of_result: t('activities.result_type.asset') diff --git a/app/controllers/result_tables_controller.rb b/app/controllers/result_tables_controller.rb index 110a4571b..4c386e680 100644 --- a/app/controllers/result_tables_controller.rb +++ b/app/controllers/result_tables_controller.rb @@ -180,8 +180,8 @@ class ResultTablesController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: @result, - team: @my_module.experiment.project.team, - project: @my_module.experiment.project, + team: @my_module.team, + project: @my_module.project, message_items: { result: @result.id, type_of_result: t('activities.result_type.table') diff --git a/app/controllers/result_texts_controller.rb b/app/controllers/result_texts_controller.rb index 280610e43..da74b68b3 100644 --- a/app/controllers/result_texts_controller.rb +++ b/app/controllers/result_texts_controller.rb @@ -206,8 +206,8 @@ class ResultTextsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: @result, - team: @my_module.experiment.project.team, - project: @my_module.experiment.project, + team: @my_module.team, + project: @my_module.project, message_items: { result: @result.id, type_of_result: t('activities.result_type.text') diff --git a/app/controllers/results_controller.rb b/app/controllers/results_controller.rb index c231786fd..220ee813d 100644 --- a/app/controllers/results_controller.rb +++ b/app/controllers/results_controller.rb @@ -14,8 +14,8 @@ class ResultsController < ApplicationController .call(activity_type: :destroy_result, owner: current_user, subject: @result, - team: @my_module.experiment.project.team, - project: @my_module.experiment.project, + team: @my_module.team, + project: @my_module.project, message_items: { result: @result.id, type_of_result: result_type }) flash[:success] = t('my_modules.module_archive.delete_flash', diff --git a/app/controllers/step_comments_controller.rb b/app/controllers/step_comments_controller.rb index 714c232a0..c7ecfa5f0 100644 --- a/app/controllers/step_comments_controller.rb +++ b/app/controllers/step_comments_controller.rb @@ -78,8 +78,8 @@ class StepCommentsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: @protocol, - team: current_team, - project: @step.my_module.experiment.project, + team: @step.my_module.team, + project: @step.my_module.project, message_items: { my_module: @step.my_module.id, step: @step.id, diff --git a/app/controllers/step_elements/base_controller.rb b/app/controllers/step_elements/base_controller.rb index 2c41d5479..4ceed0c1d 100644 --- a/app/controllers/step_elements/base_controller.rb +++ b/app/controllers/step_elements/base_controller.rb @@ -40,8 +40,8 @@ module StepElements Activities::CreateActivityService.call( activity_type: "#{!@step.protocol.in_module? ? 'protocol_step_' : 'task_step_'}#{element_type_of}", owner: current_user, - team: @protocol.in_module? ? @protocol.my_module.experiment.project.team : @protocol.team, - project: @protocol.in_module? ? @protocol.my_module.experiment.project : nil, + team: @protocol.team, + project: @protocol.in_module? ? @protocol.my_module.project : nil, subject: @protocol, message_items: { step: @step.id, diff --git a/app/controllers/step_elements/checklist_items_controller.rb b/app/controllers/step_elements/checklist_items_controller.rb index 2a4fa806f..bb59f52d7 100644 --- a/app/controllers/step_elements/checklist_items_controller.rb +++ b/app/controllers/step_elements/checklist_items_controller.rb @@ -144,7 +144,7 @@ module StepElements owner: current_user, subject: @step.protocol, team: @step.protocol.team, - project: @step.protocol.in_module? ? @step.protocol.my_module.experiment.project : nil, + project: @step.protocol.in_module? ? @step.protocol.my_module.project : nil, message_items: message_items.merge(step_message_items) ) end diff --git a/app/controllers/step_orderable_elements_controller.rb b/app/controllers/step_orderable_elements_controller.rb index 70e7509be..801c6fbac 100644 --- a/app/controllers/step_orderable_elements_controller.rb +++ b/app/controllers/step_orderable_elements_controller.rb @@ -48,7 +48,7 @@ class StepOrderableElementsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: @protocol, - team: current_team, + team: @protocol.team, project: project, message_items: message_items) end diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb index 9bbfedf45..f9dbe66c5 100644 --- a/app/controllers/steps_controller.rb +++ b/app/controllers/steps_controller.rb @@ -38,7 +38,7 @@ class StepsController < ApplicationController @asset = @step.assets.create!( created_by: current_user, last_modified_by: current_user, - team: current_team, + team: @protocol.team, view_mode: @step.assets_view_mode ) @asset.file.attach(params[:signed_blob_id]) @@ -323,7 +323,7 @@ class StepsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: @protocol, - team: current_team, + team: @protocol.team, project: project, message_items: message_items) end diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index e561e1d4d..29c84a8df 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -168,7 +168,7 @@ class TagsController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: subject, - team: current_team, + team: @tag.project.team, project: @tag.project, message_items: message_items) end diff --git a/app/controllers/team_repositories_controller.rb b/app/controllers/team_repositories_controller.rb index e0bf0ed48..3840fbeea 100644 --- a/app/controllers/team_repositories_controller.rb +++ b/app/controllers/team_repositories_controller.rb @@ -97,7 +97,7 @@ class TeamRepositoriesController < ApplicationController .call(activity_type: type_of, owner: current_user, subject: team_shared_object.shared_repository, - team: current_team, + team: @repository.team, message_items: { repository: team_shared_object.shared_repository.id, team: team_shared_object.team.id, permission_level: