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

Merge pull request from okriuchykhin/ok_SCI_4881

Browse source 
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
This commit is contained in:
Alex Kriuchykhin 2020-09-15 12:53:01 +02:00 committed by GitHub
commit 6269802be4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

2
app/controllers/my_module_repositories_controller.rb
View file

@ -123,7 +123,7 @@ class MyModuleRepositoriesController < ApplicationController
Activities::CreateActivityService.call(
activity_type: :export_inventory_items_assigned_to_task,
owner: current_user,
subject: @repository,
subject: @my_module,
team: current_team,
message_items: {
my_module: @my_module.id,

2
app/controllers/my_module_repository_snapshots_controller.rb
View file

@ -108,7 +108,7 @@ class MyModuleRepositorySnapshotsController < ApplicationController
Activities::CreateActivityService.call(
activity_type: :export_inventory_snapshot_items_assigned_to_task,
owner: current_user,
subject: @repository_snapshot,
subject: @my_module,
team: current_team,
message_items: {
my_module: @my_module.id,

2
config/initializers/extends.rb
View file

@ -296,7 +296,7 @@ class Extends
task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128],
task: [8, 58, 9, 59, *10..14, 35, 36, 37, 53, 54, *60..63, 138, 139, 140, 64, *66..69, 106, 126, 120, 132],
task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 111, 45, 46, 47, 121, 124, 115, 118, 127, 130, 137],
task_inventory: [55, 56],
task_inventory: [55, 56, 146, 147],
experiment: [*27..31, 57],
reports: [48, 50, 49],
inventories: [70, 71, 105, 144, 145, 72, 73, 74, 102, 142, 143, 75, 76, 77, 78, 96, 107, 113, 114, *133..136],