From 97c01c386b74070ee4ee9184a654d57f08885673 Mon Sep 17 00:00:00 2001 From: Zanz2 Date: Sat, 10 Mar 2018 22:48:25 +0100 Subject: [PATCH 1/2] pushing fix --- app/helpers/protocols_io_helper.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/helpers/protocols_io_helper.rb b/app/helpers/protocols_io_helper.rb index 915d9bb94..1d7bf974a 100644 --- a/app/helpers/protocols_io_helper.rb +++ b/app/helpers/protocols_io_helper.rb @@ -165,7 +165,13 @@ module ProtocolsIoHelper end def step_hash_null?(step_json) - step_json.dig(0, 'components', 0, 'component_type_id').nil? + return false unless step_json.dig( + 0, 'components', 0, 'component_type_id' + ).nil? + return false unless step_json.dig( + 0, 'components', '0', 'component_type_id' + ).nil? + true end # Images are allowed in: @@ -350,7 +356,6 @@ module ProtocolsIoHelper return unordered_step_json if base_step.nil? number_of_steps = unordered_step_json.size return unordered_step_json if number_of_steps == 1 - base_step = unordered_step_json.find { |step| step['previous_guid'].nil? } step_order = [] step_counter = 0 step_order[step_counter] = base_step From bf34d82791710226b5a924d032c6c5621fc1c236 Mon Sep 17 00:00:00 2001 From: Zanz2 Date: Tue, 13 Mar 2018 17:42:26 +0100 Subject: [PATCH 2/2] refactored to PR --- app/helpers/protocols_io_helper.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/helpers/protocols_io_helper.rb b/app/helpers/protocols_io_helper.rb index 1d7bf974a..850a4447c 100644 --- a/app/helpers/protocols_io_helper.rb +++ b/app/helpers/protocols_io_helper.rb @@ -165,13 +165,11 @@ module ProtocolsIoHelper end def step_hash_null?(step_json) - return false unless step_json.dig( + step_json.dig( 0, 'components', 0, 'component_type_id' - ).nil? - return false unless step_json.dig( + ).nil? && step_json.dig( 0, 'components', '0', 'component_type_id' ).nil? - true end # Images are allowed in: