scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 08:21:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2173 from biosistemika/release_1_17_4

Browse source 
Merge release 1.17.4 to master
This commit is contained in:
Alex Kriuchykhin 2019-10-22 13:21:02 +02:00 • committed by GitHub
commit e333e7c44a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.17.3 1.17.4

4
app/services/spreadsheet_parser.rb
View file

@ -33,7 +33,7 @@ class SpreadsheetParser
if sheet.is_a?(Roo::CSV) if sheet.is_a?(Roo::CSV)
sheet sheet
elsif sheet.is_a?(Roo::Excelx) elsif sheet.is_a?(Roo::Excelx)
sheet.each_row_streaming sheet.each_row_streaming(pad_cells: true)
else else
sheet.rows sheet.rows
end end
@ -60,7 +60,7 @@ class SpreadsheetParser
if row.is_a?(Hash) if row.is_a?(Hash)
row.values.map(&:to_s) row.values.map(&:to_s)
elsif sheet.is_a?(Roo::Excelx) elsif sheet.is_a?(Roo::Excelx)
row.map { |cell| cell.value.to_s } row.map { |cell| cell&.value&.to_s }
else else
row.map(&:to_s) row.map(&:to_s)
end end