scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 11:45:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2224 from okriuchykhin/ok_SCI_4112

Browse source 
Fix adding experiment contents to report [SCI-4112]
This commit is contained in:
Alex Kriuchykhin 2019-11-26 09:50:28 +01:00 committed by GitHub
commit 111056a032
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/reports_controller.rb
View file

@ -18,6 +18,7 @@ class ReportsController < ApplicationController
step_contents_modal step_contents_modal
result_contents_modal result_contents_modal
project_contents project_contents
experiment_contents
module_contents module_contents
step_contents step_contents
result_contents result_contents
@ -343,7 +344,7 @@ class ReportsController < ApplicationController
respond_to do |format| respond_to do |format|
if experiment.blank? if experiment.blank?
format.json { render json: {}, status: :not_found } format.json { render json: {}, status: :not_found }
elsif modules.blank? elsif selected_modules.blank?
format.json { render json: {}, status: :no_content } format.json { render json: {}, status: :no_content }
else else
elements = generate_experiment_contents_json(selected_modules) elements = generate_experiment_contents_json(selected_modules)