From 29b9d503632a656f68289eb7203ec731f174b02b Mon Sep 17 00:00:00 2001
From: Zanz2 <zan.zagar@hotmail.com>
Date: Thu, 14 Sep 2017 11:30:53 +0200
Subject: [PATCH] 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                    | 7 ++++++-
 .../import_export/_import_json_protocol_modal.html.erb     | 1 +
 .../_import_json_protocol_preview_modal.html.erb           | 4 +++-
 app/views/protocols/index.html.erb                         | 5 ++---
 app/views/protocols/protocolsio_import_create.js.erb       | 3 +++
 5 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 app/views/protocols/protocolsio_import_create.js.erb

diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index 005f609dd..760a96a9f 100644
--- a/app/controllers/protocols_controller.rb
+++ b/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
diff --git a/app/views/protocols/import_export/_import_json_protocol_modal.html.erb b/app/views/protocols/import_export/_import_json_protocol_modal.html.erb
index a9bfc0a61..5d35ba8c7 100644
--- a/app/views/protocols/import_export/_import_json_protocol_modal.html.erb
+++ b/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>
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 07510de19..771b74ea3 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
@@ -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">
diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb
index 8f50b9c33..ba32d0abf 100644
--- a/app/views/protocols/index.html.erb
+++ b/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" %>
diff --git a/app/views/protocols/protocolsio_import_create.js.erb b/app/views/protocols/protocolsio_import_create.js.erb
new file mode 100644
index 000000000..adc018015
--- /dev/null
+++ b/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');