From ed64ce814aa859e60104b10beeedb3fbe9ec37b1 Mon Sep 17 00:00:00 2001 From: Zanz2 Date: Tue, 19 Sep 2017 16:07:54 +0200 Subject: [PATCH] i think i finally solved it, i found the issue being a certain file upload gem forcing textbox to .js files (remotipart), i tracked down their github issues and found a user that made a fix to this bug, copied his code ant it works, turns out it was a & symbol type escaped string breaking the javascript --- .../_import_json_protocol_preview_modal.html.erb | 2 +- app/views/protocols/protocolsio_import_create.js.erb | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb b/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb index 04fdff87b..fc3a8eb59 100644 --- a/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb +++ b/app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb @@ -8,7 +8,7 @@ #kaj dela: .remove("\"") na stringih, sanitize_input ampak pokvari stran %> - <%= hidden_field_tag :banana, (@json_object['steps'][0]['components'][0]) %> + <%= hidden_field_tag :banana, (@json_object['steps']) %> <%# end %> diff --git a/app/views/protocols/protocolsio_import_create.js.erb b/app/views/protocols/protocolsio_import_create.js.erb index 9389beee8..8d8b03acf 100644 --- a/app/views/protocols/protocolsio_import_create.js.erb +++ b/app/views/protocols/protocolsio_import_create.js.erb @@ -1,6 +1,9 @@ $('#modal-import-json-protocol').modal('hide'); - -$('#protocolsio-preview-modal-target').html("<%= j(render(:partial => 'protocols/import_export/import_json_protocol_preview_modal')) %>") +<% if remotipart_submitted? %> + $('#protocolsio-preview-modal-target').html("<%= j "#{render(:partial => 'protocols/import_export/import_json_protocol_preview_modal')}" %>"); +<% else %> + $('#protocolsio-preview-modal-target').html("<%= j render(:partial => 'protocols/import_export/import_json_protocol_preview_modal') %>"); +<% end %> $('#modal-import-json-protocol-preview').modal('show');