scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-30 19:48:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3296 from okriuchykhin/ok_SCI_5699

Browse source 
Improve handling of selected inventories in reports [SCI-5699]
This commit is contained in:
Miha Mencin 2021-05-10 10:48:09 +02:00 committed by GitHub
commit 56a6c0825d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/reports_controller.rb
View file

@ -115,9 +115,9 @@ class ReportsController < ApplicationController
@report.settings = Report::DEFAULT_SETTINGS if @report.settings.blank? @report.settings = Report::DEFAULT_SETTINGS if @report.settings.blank?
@project_contents = { @project_contents = {
experiments: @report.report_elements.where(type_of: 'experiment').pluck(:experiment_id), experiments: @report.report_elements.experiment.pluck(:experiment_id),
my_modules: @report.report_elements.where(type_of: 'my_module').pluck(:my_module_id), my_modules: @report.report_elements.my_module.pluck(:my_module_id),
repositories: @report.report_elements.where(type_of: 'my_module_repository').pluck(:repository_id).uniq repositories: @report.report_elements.my_module_repository.distinct(:repository_id).pluck(:repository_id)
} }
render :new render :new
end end