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

Merge branch 'master' into ok_SCI_2148

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2018-03-16 10:21:02 +01:00
commit f3385adb06
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/helpers/protocols_io_helper.rb
View file

@ -165,7 +165,11 @@ module ProtocolsIoHelper
end end
def step_hash_null?(step_json) def step_hash_null?(step_json)
step_json.dig(0, 'components', 0, 'component_type_id').nil? step_json.dig(
0, 'components', 0, 'component_type_id'
).nil? && step_json.dig(
0, 'components', '0', 'component_type_id'
).nil?
end end
# Images are allowed in: # Images are allowed in:
@ -350,7 +354,6 @@ module ProtocolsIoHelper
return unordered_step_json if base_step.nil? return unordered_step_json if base_step.nil?
number_of_steps = unordered_step_json.size number_of_steps = unordered_step_json.size
return unordered_step_json if number_of_steps == 1 return unordered_step_json if number_of_steps == 1
base_step = unordered_step_json.find { |step| step['previous_guid'].nil? }
step_order = [] step_order = []
step_counter = 0 step_counter = 0
step_order[step_counter] = base_step step_order[step_counter] = base_step