diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index 1798dca63..b3a741dfe 100644
--- a/app/controllers/protocols_controller.rb
+++ b/app/controllers/protocols_controller.rb
@@ -609,7 +609,7 @@ def protocolsio_import_create
json_file_contents=File.read(params[:json_file].path)
json_file_contents.gsub! '\"', "'"
- #byebug
+
@json_object=JSON.parse((json_file_contents))
@protocol=Protocol.new
diff --git a/app/utilities/protocols_importer.rb b/app/utilities/protocols_importer.rb
index 9a9d259db..07f9aefb1 100644
--- a/app/utilities/protocols_importer.rb
+++ b/app/utilities/protocols_importer.rb
@@ -41,8 +41,15 @@ module ProtocolsImporter
protocol
end
+ def import_new_protocols_io_json()
+
+
+
+
+ end
private
+
def populate_protocol(protocol, protocol_json, user, team)
protocol.reload
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 fc3a8eb59..b8fd92b34 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']) %>
+ <%= hidden_field_tag :json_object, JSON.generate(@json_object) %>
<%# end %>
@@ -81,7 +81,7 @@
Before starting protocol information
- <%= strip_tags(@json_object["before_start"].remove("\"")) %>
+ <%= (@json_object["before_start"]) %>
|
@@ -92,7 +92,7 @@
Protocol warning
- <%= strip_tags(@json_object["warning"].remove("\"")) %>
+ <%= (@json_object["warning"]) %>
|
@@ -106,7 +106,7 @@
Guidelines
- <%= strip_tags(@json_object["guidelines"].remove("\"")) %>
+ <%= (@json_object["guidelines"]) %>
|
@@ -138,7 +138,7 @@
<% if whitelist_simple.include?(key["component_type_id"]) && key["data"]!="" && key["name"] && key["data"]%>
- <%= strip_tags(key["name"].remove("\""))+" : "+ strip_tags(key["data"].remove("\"")) %>
+ <%= (key["name"])+" : "+ (key["data"]) %>
<% #byebug
#debug
#comp[counter];counter;@json.file_contents["steps"][3]["components"][0]["name"]
@@ -150,47 +150,47 @@
<% case key["component_type_id"]%>
<% when "8"%>
- <%= "-"+strip_tags(key["name"].remove("\""))+" : "+strip_tags(key["source_data"]["name"].remove("\"")) %>
+ <%= "-"+(key["name"])+" : "+(key["source_data"]["name"]) %>
- Developer : <%= strip_tags(key["source_data"]["developer"].remove("\"")) %>
+ Developer : <%= (key["source_data"]["developer"]) %>
- Version : <%= strip_tags(key["source_data"]["version"].remove("\"")) %>
+ Version : <%= (key["source_data"]["version"]) %>
- Link : <%= strip_tags(key["source_data"]["link"].remove("\"")) %>
+ Link : <%= (key["source_data"]["link"]) %>
- Repository : <%= strip_tags(key["source_data"]["repository"].remove("\"")) %>
+ Repository : <%= (key["source_data"]["repository"]) %>
- OS name , OS version : <%= strip_tags(key["source_data"]["os_name"].remove("\""))+" , "+strip_tags(key["source_data"]["os_version"].remove("\"")) %>
+ OS name , OS version : <%= (key["source_data"]["os_name"])+" , "+(key["source_data"]["os_version"]) %>
<% when "9"%>
- <%= "-"+strip_tags(key["name"].remove("\""))+" : "+strip_tags(key["source_data"]["name"].remove("\"")) %>
+ <%= "-"+(key["name"])+" : "+(key["source_data"]["name"]) %>
- Link : <%= strip_tags(key["source_data"]["link"].remove("\"")) %>
+ Link : <%= (key["source_data"]["link"]) %>
<% when "15"%>
- <%= "-"+strip_tags(key["name"].remove("\""))+" : "+strip_tags(key["source_data"]["name"].remove("\"")) %>
+ <%= "-"+(key["name"])+" : "+(key["source_data"]["name"]) %>
- Description : <%= strip_tags(key["source_data"]["description"].remove("\"")) %>
+ Description : <%= (key["source_data"]["description"]) %>
- OS name , OS version : <%= strip_tags(key["source_data"]["os_name"].remove("\""))+" , "+strip_tags(key["source_data"]["os_version"].remove("\"")) %>
+ OS name , OS version : <%= (key["source_data"]["os_name"])+" , "+(key["source_data"]["os_version"]) %>
<% when "18"%>
- -This protocol also contains an attached sub-protocol: <%= strip_tags(key["source_data"]["protocol_name"].remove("\"")) %>
+ -This protocol also contains an attached sub-protocol: <%= (key["source_data"]["protocol_name"]) %>
- Author: <%= strip_tags(key["source_data"]["full_name"].remove("\"")) %>
+ Author: <%= (key["source_data"]["full_name"]) %>
<% if key["source_data"]["link"]&&key["source_data"]["link"]!="" %>
- Link: <%= strip_tags(key["source_data"]["link"].remove("\"")) %>
+ Link: <%= (key["source_data"]["link"]) %>
<% end %>
<% when "19"%>
- <%= "-"+strip_tags(key["name"].remove("\""))+" : "+strip_tags(key["source_data"]["body"].remove("\"")) %>
+ <%= "-"+(key["name"])+" : "+(key["source_data"]["body"]) %>
- Link : <%= strip_tags(key["source_data"]["link"].remove("\"")) %>
+ Link : <%= (key["source_data"]["link"]) %>
<% when "20"%>
@@ -212,7 +212,7 @@
<% if whitelist_simple.include?(value["component_type_id"])&& value["data"]!="" && value["name"] && value["data"] %>
- <%= strip_tags(value["name"].remove("\""))+" : "+strip_tags(value["data"].remove("\"")) %>
+ <%= (value["name"])+" : "+(value["data"]) %>
<%
#debug
#comp[counter];counter;@json.file_contents["steps"][3]["components"][0]["name"]
@@ -223,48 +223,48 @@
<% case value["component_type_id"]%>
<% when "8"%>
- <%= "-"+strip_tags(value["name"].remove("\""))+" : "+strip_tags(value["source_data"]["name"].remove("\"")) %>
+ <%= "-"+(value["name"])+" : "+(value["source_data"]["name"]) %>
- Developer : <%= strip_tags(value["source_data"]["developer"].remove("\"")) %>
+ Developer : <%= (value["source_data"]["developer"]) %>
- Version : <%= strip_tags(value["source_data"]["version"].remove("\"")) %>
+ Version : <%= (value["source_data"]["version"]) %>
- Link : <%= strip_tags(value["source_data"]["link"].remove("\"")) %>
+ Link : <%= (value["source_data"]["link"]) %>
- Repository : <%= strip_tags(value["source_data"]["repository"].remove("\"")) %>
+ Repository : <%= (value["source_data"]["repository"]) %>
- OS name , OS version : <%= strip_tags(value["source_data"]["os_name"].remove("\""))+" , "+strip_tags(value["source_data"]["os_version"].remove("\"")) %>
+ OS name , OS version : <%= (value["source_data"]["os_name"])+" , "+(value["source_data"]["os_version"]) %>
<% when "9"%>
- <%= "-"+strip_tags(value["name"].remove("\""))+" : "+strip_tags(value["source_data"]["name"].remove("\"")) %>
+ <%= "-"+(value["name"])+" : "+(value["source_data"]["name"]) %>
- Link : <%= strip_tags(value["source_data"]["link"].remove("\"")) %>
+ Link : <%= (value["source_data"]["link"]) %>
<% when "15"%>
- <%= "-"+strip_tags(value["name"].remove("\""))+" : "+strip_tags(value["source_data"]["name"].remove("\"")) %>
+ <%= "-"+(value["name"])+" : "+(value["source_data"]["name"]) %>
- Description : <%= strip_tags(value["source_data"]["description"].remove("\"")) %>
+ Description : <%= (value["source_data"]["description"]) %>
- OS name , OS version : <%= strip_tags(value["source_data"]["os_name"].remove("\""))+" , "+strip_tags(value["source_data"]["os_version"].remove("\"")) %>
+ OS name , OS version : <%= (value["source_data"]["os_name"])+" , "+(value["source_data"]["os_version"]) %>
<% when "18"%>
- -This protocol also contains an attached sub-protocol: <%= strip_tags(value["source_data"]["protocol_name"].remove("\"")) %>
+ -This protocol also contains an attached sub-protocol: <%= (value["source_data"]["protocol_name"]) %>
- Author: <%= strip_tags(value["source_data"]["full_name"].remove("\"")) %>
+ Author: <%= (value["source_data"]["full_name"]) %>
<% if value["source_data"]["link"]&&value["source_data"]["link"]!="" %>
- Link: <%= strip_tags(value["source_data"]["link"].remove("\"")) %>
+ Link: <%= (value["source_data"]["link"]) %>
<% end %>
<% when "19"%>
- <%= "-"+strip_tags(value["name"])+" : "+strip_tags(value["source_data"]["body"].remove("\"")) %>
+ <%= "-"+(value["name"])+" : "+(value["source_data"]["body"]) %>
- Link : <%= strip_tags(value["source_data"]["link"].remove("\"")) %>
+ Link : <%= (value["source_data"]["link"]) %>
<% when "20"%>
@@ -293,7 +293,7 @@
Manuscript citation
- <%= strip_tags(@json_object["manuscript_citation"].remove("\"")) %>
+ <%= (@json_object["manuscript_citation"]) %>
|
@@ -305,7 +305,7 @@
Publish date
- <%= strip_tags(@json_object["publish_date"].remove("\"")) %>
+ <%= (@json_object["publish_date"]) %>
|
@@ -317,7 +317,7 @@
Vendor name
- <%= strip_tags(@json_object["vendor_name"].remove("\"")) %>
+ <%= (@json_object["vendor_name"]) %>
|
@@ -328,7 +328,7 @@
Vendor link
- <%= strip_tags(@json_object["vendor_link"].remove("\"")) %>
+ <%= (@json_object["vendor_link"]) %>
|
@@ -339,7 +339,7 @@
Keywords
- <%= strip_tags(@json_object["keywords"].remove("\"")) %>
+ <%= (@json_object["keywords"]) %>
|
@@ -351,7 +351,7 @@
Tags
<% @json_object["tags"].each do |tag| %>
- <%= strip_tags(tag["tag_name"].remove("\""))+" , " %>
+ <%= (tag["tag_name"])+" , " %>
<% end %>
|