mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-20 06:35:56 +08:00
Upgrade roo to work with Ruby 3, fix rendering of import modal [SCI-8903] (#5836)
This commit is contained in:
parent
abda07bf4e
commit
7d62a805a3
2
Gemfile
2
Gemfile
|
@ -73,7 +73,7 @@ gem 'nested_form_fields'
|
|||
gem 'nokogiri', '~> 1.14.3' # HTML/XML parser
|
||||
gem 'rails_autolink', '~> 1.1', '>= 1.1.6'
|
||||
gem 'rgl' # Graph framework for project diagram calculations
|
||||
gem 'roo', '~> 2.8.2' # Spreadsheet parser
|
||||
gem 'roo', '~> 2.10.0' # Spreadsheet parser
|
||||
gem 'rotp'
|
||||
gem 'rqrcode', '~> 2.0' # QR code generator
|
||||
gem 'rubyzip', '>= 2.3.0' # will load new rubyzip version
|
||||
|
|
|
@ -561,7 +561,7 @@ GEM
|
|||
pairing_heap (>= 0.3.0)
|
||||
rexml (~> 3.2, >= 3.2.4)
|
||||
stream (~> 0.5.3)
|
||||
roo (2.8.3)
|
||||
roo (2.10.0)
|
||||
nokogiri (~> 1)
|
||||
rubyzip (>= 1.3.0, < 3.0.0)
|
||||
rotp (6.2.2)
|
||||
|
@ -787,7 +787,7 @@ DEPENDENCIES
|
|||
rails_autolink (~> 1.1, >= 1.1.6)
|
||||
recaptcha
|
||||
rgl
|
||||
roo (~> 2.8.2)
|
||||
roo (~> 2.10.0)
|
||||
rotp
|
||||
rqrcode (~> 2.0)
|
||||
rspec-rails
|
||||
|
|
|
@ -286,7 +286,7 @@ class RepositoriesController < ApplicationController
|
|||
|
||||
if (@temp_file = parsed_file.generate_temp_file)
|
||||
render json: {
|
||||
html: render_to_string(partial: 'repositories/parse_records_modal')
|
||||
html: render_to_string(partial: 'repositories/parse_records_modal', formats: :html)
|
||||
}
|
||||
else
|
||||
repository_response(t('repositories.parse_sheet.errors.temp_file_failure'))
|
||||
|
|
Loading…
Reference in a new issue