diff --git a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb index 6ecdd6549..2ad86270e 100644 --- a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb +++ b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb @@ -90,6 +90,7 @@ formulas: true, readOnly: true }); + <% table_count += 1 %> <% end %> diff --git a/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb b/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb index 54895451b..9b79e4ba3 100644 --- a/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb +++ b/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb @@ -1,5 +1,6 @@ <% whitelist_simple=['1','6','17'] %> <% whitelist_complex=['8','9','15','18','19','20']%> +<% step_table_elements_array = [] %> <% json_object['steps'].each_with_index do |step,counter_orig| %> <% counter = counter_orig + 2 %>
@@ -113,6 +114,7 @@ <% tables.each do |index, table| %> <% table_hash = JSON.parse((Base64.decode64(table['contents']))) %> <% pio_table_id = "pio_table_step_"+counter.to_s+"_info_"+table_count.to_s %> + <% step_table_elements_array.push([pio_table_id,table_hash]) %>
diff --git a/app/views/protocols/protocolsio_import_create.js.erb b/app/views/protocols/protocolsio_import_create.js.erb index ba20d05c3..97e06ea92 100644 --- a/app/views/protocols/protocolsio_import_create.js.erb +++ b/app/views/protocols/protocolsio_import_create.js.erb @@ -14,4 +14,5 @@ alert('<%= I18n.t('my_modules.protocols.load_from_file_size_error', ); <% end %> $('#modal-import-json-protocol-preview').modal('show'); + <% end %>