scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 06:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade roo to work with Ruby 3, fix rendering of import modal [SCI-8903] (#5836)

Browse source
This commit is contained in:
artoscinote 2023-07-21 12:48:32 +02:00 committed by GitHub
parent abda07bf4e
commit 7d62a805a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -73,7 +73,7 @@ gem 'nested_form_fields'
gem 'nokogiri', '~> 1.14.3' # HTML/XML parser gem 'nokogiri', '~> 1.14.3' # HTML/XML parser
gem 'rails_autolink', '~> 1.1', '>= 1.1.6' gem 'rails_autolink', '~> 1.1', '>= 1.1.6'
gem 'rgl' # Graph framework for project diagram calculations 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 'rotp'
gem 'rqrcode', '~> 2.0' # QR code generator gem 'rqrcode', '~> 2.0' # QR code generator
gem 'rubyzip', '>= 2.3.0' # will load new rubyzip version gem 'rubyzip', '>= 2.3.0' # will load new rubyzip version

4
Gemfile.lock
View file

@ -561,7 +561,7 @@ GEM
pairing_heap (>= 0.3.0) pairing_heap (>= 0.3.0)
rexml (~> 3.2, >= 3.2.4) rexml (~> 3.2, >= 3.2.4)
stream (~> 0.5.3) stream (~> 0.5.3)
roo (2.8.3) roo (2.10.0)
nokogiri (~> 1) nokogiri (~> 1)
rubyzip (>= 1.3.0, < 3.0.0) rubyzip (>= 1.3.0, < 3.0.0)
rotp (6.2.2) rotp (6.2.2)
@ -787,7 +787,7 @@ DEPENDENCIES
rails_autolink (~> 1.1, >= 1.1.6) rails_autolink (~> 1.1, >= 1.1.6)
recaptcha recaptcha
rgl rgl
roo (~> 2.8.2) roo (~> 2.10.0)
rotp rotp
rqrcode (~> 2.0) rqrcode (~> 2.0)
rspec-rails rspec-rails

2
app/controllers/repositories_controller.rb
View file

@ -286,7 +286,7 @@ class RepositoriesController < ApplicationController
if (@temp_file = parsed_file.generate_temp_file) if (@temp_file = parsed_file.generate_temp_file)
render json: { render json: {
html: render_to_string(partial: 'repositories/parse_records_modal') html: render_to_string(partial: 'repositories/parse_records_modal', formats: :html)
} }
else else
repository_response(t('repositories.parse_sheet.errors.temp_file_failure')) repository_response(t('repositories.parse_sheet.errors.temp_file_failure'))