Merge branch 'master' of https://github.com/biosistemika/scinote-web into validations_cutoff_SCI-1784

This commit is contained in:
Zanz2 2017-11-16 20:04:12 +01:00
commit b2e1623cf1

View file

@ -610,7 +610,7 @@ class ProtocolsController < ApplicationController
end end
return 0 # return 0 stops the rest of the controller code from executing return 0 # return 0 stops the rest of the controller code from executing
end end
if file_size / 1000 > Constants::FILE_MAX_SIZE_MB if file_size > Constants::FILE_MAX_SIZE_MB.megabytes
@protocolsio_too_big = true @protocolsio_too_big = true
respond_to do |format| respond_to do |format|
format.js {} format.js {}