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

Merge pull request #2163 from biosistemika/SCI-3994-excel-import-to-inventory-fails-v2

Browse source 
SCI-3994 fix for excel import
This commit is contained in:
Alex Kriuchykhin 2019-10-17 16:53:32 +02:00 • committed by GitHub
commit 62cf439734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/services/import_repository/import_records.rb
View file

@ -17,11 +17,13 @@ module ImportRepository
private private
def run_import_actions def run_import_actions
@repository.import_records( @temp_file.file.open do |temp_file|
SpreadsheetParser.open_spreadsheet(@temp_file.file), @repository.import_records(
@mappings, SpreadsheetParser.open_spreadsheet(temp_file),
@user @mappings,
) @user
)
end
end end
def run_checks def run_checks

4
app/services/spreadsheet_parser.rb
View file

@ -7,8 +7,8 @@ class SpreadsheetParser
filename = file.original_filename filename = file.original_filename
file_path = file.path file_path = file.path
else else
filename = file.filename.to_s filename = File.basename(file.path)
file_path = file.service_url file_path = file.path
end end
case File.extname(filename) case File.extname(filename)