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

deleted comments

Browse source
This commit is contained in:
Zanz2 2017-10-12 19:18:22 +02:00
parent 8d0d6f0502
commit e72c1bebcb
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/protocols_controller.rb
View file

@ -599,7 +599,6 @@ class ProtocolsController < ApplicationController
def protocolsio_import_create def protocolsio_import_create
@protocolsio_too_big = false @protocolsio_too_big = false
file_size = File.size(params[:json_file].path) file_size = File.size(params[:json_file].path)
if file_size / 1000 > Constants::FILE_MAX_SIZE_MB if file_size / 1000 > Constants::FILE_MAX_SIZE_MB
@protocolsio_too_big = true @protocolsio_too_big = true
respond_to do |format| respond_to do |format|
@ -901,7 +900,6 @@ class ProtocolsController < ApplicationController
private private
# skok
def protocolsio_step_description_populate(iterating_key) def protocolsio_step_description_populate(iterating_key)
append = '<br>' + sanitize_input(iterating_key) + '<br>' if iterating_key.present? append = '<br>' + sanitize_input(iterating_key) + '<br>' if iterating_key.present?
append = I18n.t('protocols.protocols_io_import.comp_append.missing_desc') if iterating_key.blank? append = I18n.t('protocols.protocols_io_import.comp_append.missing_desc') if iterating_key.blank?
@ -1038,7 +1036,7 @@ class ProtocolsController < ApplicationController
end end
description_string description_string
end end
# skok
def protocols_io_fill_step(original_json, create_json) def protocols_io_fill_step(original_json, create_json)
# (simple to map) id 1= step description, id 6= section (title), # (simple to map) id 1= step description, id 6= section (title),
# id 17= expected result # id 17= expected result