Modals now popup correctly trough ajax, added js file for this functionality, and two partials which are reused from existing importer

app/controllers/protocols_controller.rb

@@ -609,7 +609,12 @@ def protocolsio_import_create
 
   json_file_contents=File.read(params[:json_file].path)
   @json_object=JSON.parse(json_file_contents)
-  render :partial => "/protocols/import_json_protocol_preview_modal"
+  
+  respond_to do |format|
+    format.html
+    format.js
+  end
+
 end
 
 def protocolsio_temp_params

app/views/protocols/import_export/_import_json_protocol_modal.html.erb

@@ -18,6 +18,7 @@
         <%= submit_tag t("protocols.index.modal_import_json_submit"), class: "btn btn-default" %>
       </div>
       <% end %>
+      
     </div>
   </div>
 </div>

app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb

@@ -1,4 +1,4 @@
-<div id="import-json-protocol-preview-modal" class="modal fade" role="dialog">
+<div id="modal-import-json-protocol-preview" class="modal fade" role="dialog">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -12,6 +12,8 @@
           <b><%= t("protocols.import_export.import_modal.import_into_protocol_message") %></b>
           <br />
         </div>
+        <% #puts json_object %>
+        <% #byebug %>
 
         <!-- General protocol info -->
         <div class="form-group">

app/views/protocols/index.html.erb

@@ -1,11 +1,8 @@
-<%= render partial: "protocols/import_export/import_json_protocol_modal" %>
-<%= render partial: "protocols/import_export/import_json_protocol_preview_modal" %>
 
 <% provide(:head_title, t("protocols.index.head_title")) %>
 
 <% if current_team %>
   <%= render partial: "protocols/breadcrumbs.html.erb", locals: { teams: @teams, current_team: @current_team, type: @type } %>
-
   <ul class="nav nav-tabs nav-settings">
     <li role="presentation" class="<%= "active" if @type == :public %>">
       <%= link_to t("protocols.index.navigation.public"), protocols_path(team: @current_team, type: :public) %>
@@ -145,6 +142,8 @@
   </div>
 <% end %>
 
+<%= render partial: "protocols/import_export/import_json_protocol_modal" %>
+<%#= render partial: "protocols/import_export/import_json_protocol_preview_modal" %>
 <%= render partial: "protocols/index/create_new_modal.html.erb" %>
 <%= render partial: "protocols/index/make_private_results_modal.html.erb" %>
 <%= render partial: "protocols/index/publish_results_modal.html.erb" %>

app/views/protocols/protocolsio_import_create.js.erb

@@ -0,0 +1,3 @@
+$('#modal-import-json-protocol').modal('hide');
+$('#import-export-protocols').append("<%= j render(:partial => "protocols/import_export/import_json_protocol_preview_modal", :locals => {:json_object => @json_object}) %>")
+$('#modal-import-json-protocol-preview').modal('show');