diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index 50b924d00..9a9f4a2b4 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb @@ -122,7 +122,7 @@ class AssetsController < ApplicationController 'marvinjs' => :move_chemical_structure_on_result, 'gene_sequence' => :sequence_on_result_moved }.fetch(@asset.file.metadata[:asset_type], :result_file_moved) - + log_result_activity( type_of, @assoc, diff --git a/app/controllers/gene_sequence_assets_controller.rb b/app/controllers/gene_sequence_assets_controller.rb index b2a68d670..294cc6e11 100644 --- a/app/controllers/gene_sequence_assets_controller.rb +++ b/app/controllers/gene_sequence_assets_controller.rb @@ -25,7 +25,7 @@ class GeneSequenceAssetsController < ApplicationController def create save_asset! - + case @parent when Step log_activity('sequence_asset_added') @@ -34,10 +34,10 @@ class GeneSequenceAssetsController < ApplicationController :sequence_on_result_added, @parent, file: @asset.file_name, - user: current_user.id, + user: current_user.id ) end - + head :ok end @@ -52,7 +52,7 @@ class GeneSequenceAssetsController < ApplicationController :sequence_on_result_edited, @parent, file: @asset.file_name, - user: current_user.id, + user: current_user.id ) end diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb index 04f4a7acf..88aba27c2 100644 --- a/config/initializers/extends.rb +++ b/config/initializers/extends.rb @@ -500,7 +500,7 @@ class Extends task: [8, 58, 9, 59, *10..14, 35, 36, 37, 53, 54, *60..63, 138, 139, 140, 64, 66, 106, 126, 120, 132, *146..148, 166, 246, 247, 248], task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 111, 45, 46, 47, 121, 124, 115, 118, 127, 130, 137, - 217, 168, 171, 177, 184, 185, 188, 189, *192..203, 222, 224, 225, 226, 236, *249..252, *274..278, + 217, 168, 171, 177, 184, 185, 188, 189, *192..203, 222, 224, 225, 226, 236, *249..252, *274..278, *287..290], task_inventory: [55, 56, 146, 147, 183], experiment: [*27..31, 57, 141, 165],