scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 11:45:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

Refactor github code review

Browse source
This commit is contained in:
Zanz2 2017-10-07 16:07:04 +02:00
parent 66e5004e60
commit f5b2ad0d34
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/protocols_controller.rb
View file

@ -1022,8 +1022,7 @@ class ProtocolsController < ApplicationController
append = I18n.t('protocols.protocols_io_import.comp_append.expected_result') + append = I18n.t('protocols.protocols_io_import.comp_append.expected_result') +
iterating_key['data'] + '<br>' iterating_key['data'] + '<br>'
result['steps'][pos2.to_s]['description'] << append result['steps'][pos2.to_s]['description'] << append
byebug end
end #dbg
result result
end end

1
app/utilities/protocols_importer.rb
View file

@ -45,7 +45,6 @@ module ProtocolsImporter
def populate_protocol(protocol, protocol_json, user, team) def populate_protocol(protocol, protocol_json, user, team)
protocol.reload protocol.reload
asset_ids = [] asset_ids = []
step_pos = 0 step_pos = 0
# Check if protocol has steps # Check if protocol has steps

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

@ -1,4 +1,6 @@
<%= form_for(@protocol, :url => url_for(:controller => 'protocols', :action=>'protocolsio_import_save'),method: :post,format: :javascript,remote: true,:html=> { :id => "protocolsio-import-form" }) do |f| %> <%= form_for(@protocol, :url => url_for(:controller => 'protocols',
:action=>'protocolsio_import_save'),method: :post,format: :javascript,
remote: true, :html=> { :id => "protocolsio-import-form" }) do |f| %>
<%= hidden_field_tag :json_object, JSON.generate(@json_object) %> <%= hidden_field_tag :json_object, JSON.generate(@json_object) %>