scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-11 23:54:43 +08:00
Code Issues Projects Releases Packages Wiki Activity

Testing why rubocop gives errors

Browse source
This commit is contained in:
Zanz2 2017-09-25 15:27:24 +02:00
parent 79e065a811
commit 2bfe8f0b95
2 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/protocols_controller.rb
View file

@ -638,7 +638,7 @@ class ProtocolsController < ApplicationController
]
description_string = Sanitize.clean(params['protocol']['description'])
description_array.each do |element|
if element == 'created_on'
if element == 'created_on' #združ
if @json_object[element] && @json_object[element] != ''
new_element = element.slice(0, 1).capitalize + element.slice(1..-1)
new_element = new_element.tr('_', ' ')
@ -648,7 +648,7 @@ class ProtocolsController < ApplicationController
Sanitize.clean(params['protocol']['created_at'].to_s) + "\n"
end
else
if element == 'tags'
if element == 'tags' #združ
if @json_object[element].any? && @json_object[element] != ''
new_element = element.slice(0, 1).capitalize + element.slice(1..-1)
new_element = new_element.tr('_', ' ')

35
app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb
View file

@ -145,32 +145,31 @@ CGI.parse(URI.parse(request.referrer).query).fetch("type") %>
<div class="tab-pane active" role="tabpanel">
<div data-val="description" class="ql-editor">
<% step["components"].each do |key,value| %>
<% step["components"].each do |key,value| %>
<%#here i made an if to distinguish the first step from the
others, because the first step #sometimes has index values as keys instead of
hashes, you might see this elsewhere %>
<% if value.class==Hash %>
<% if value.class==Hash %>
<% key=value %>
<% end %>
<% end %>
<% # the below blocks of code output the various attributes if they exist and arent null or "" from the json object %>
<% if whitelist_simple.include?(key["component_type_id"]) && key["data"]!="" && key["data"] %>
<% if whitelist_simple.include?(key["component_type_id"]) && key["data"]!="" && key["data"] %>
<br>
<% case key["component_type_id"]%>
<% when "1" %>
<br>
<strong>Description:
</strong>
<%=key["data"]%><br>
<br>
<strong>
Description:
</strong>
<%=key["data"]%><br>
<% when "17" %>
<br>
<strong>Expected result:
</strong>
<%=key["data"]%><br>
<% else %>
<br>
<strong>Expected result:
</strong>
<%=key["data"]%>
<br>
<% end %>
<% elsif key && whitelist_complex.include?(key["component_type_id"]) %>
<% elsif key && whitelist_complex.include?(key["component_type_id"]) %>
<% case key["component_type_id"]%>
<% when "8"%>
@ -198,7 +197,7 @@ CGI.parse(URI.parse(request.referrer).query).fetch("type") %>
<strong><%= key["name"]+": " %></strong>
<%= key["source_data"]["name"] %>
<br>
Link :
Link:
<%= (key["source_data"]["link"]) %>
<% when "15"%>
@ -328,7 +327,7 @@ CGI.parse(URI.parse(request.referrer).query).fetch("type") %>
</div>
</div>
</div>
<% # the below script resets all the fields after you decide not to import the file (cancel (modal hide)) %>
<%# the below script resets all the fields after you decide not to import the file (cancel (modal hide)) %>
<script>
$('#modal-import-json-protocol-preview').on('hide.bs.modal', function () {
$('#protocols_io_form').trigger("reset");