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

Improved samples assign/unassign logging [SCI-605]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2016-11-03 17:59:32 +01:00
parent 3d25da5db7
commit a1bfacef86
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/my_modules_controller.rb
View file

@ -272,6 +272,7 @@ class MyModulesController < ApplicationController
end end
task_names = [] task_names = []
new_samples = []
@my_module.get_downstream_modules.each do |my_module| @my_module.get_downstream_modules.each do |my_module|
new_samples = samples.select { |el| my_module.samples.exclude?(el) } new_samples = samples.select { |el| my_module.samples.exclude?(el) }
my_module.samples.push(*new_samples) my_module.samples.push(*new_samples)
@ -286,7 +287,7 @@ class MyModulesController < ApplicationController
'activities.assign_sample', 'activities.assign_sample',
user: current_user.full_name, user: current_user.full_name,
tasks: task_names.join(', '), tasks: task_names.join(', '),
samples: samples.map(&:name).join(', ') samples: new_samples.map(&:name).join(', ')
) )
) )
end end
@ -302,7 +303,7 @@ class MyModulesController < ApplicationController
sample.last_modified_by = current_user sample.last_modified_by = current_user
sample.save sample.save
if sample if sample && @my_module.samples.include?(sample)
samples << sample samples << sample
end end
end end