scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 01:35:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix import protocol [SCI-7915] (#4980)

Browse source
This commit is contained in:
ajugo 2023-02-20 10:14:32 +01:00 committed by GitHub
parent c92faeb48c
commit 461d06dad9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/protocols/import_export/import.js
View file

@ -1,3 +1,4 @@
/* eslint-disable no-param-reassign */
/* eslint-disable no-unused-vars, lines-around-comment, no-undef, no-alert */ /* eslint-disable no-unused-vars, lines-around-comment, no-undef, no-alert */
/* eslint-disable no-use-before-define, no-restricted-globals */ /* eslint-disable no-use-before-define, no-restricted-globals */
//= require protocols/import_export/eln_table.js //= require protocols/import_export/eln_table.js
@ -48,10 +49,18 @@ function importProtocolFromFile(
return (parseInt($(a).attr('position'), 10) - parseInt($(b).attr('position'), 10)); return (parseInt($(a).attr('position'), 10) - parseInt($(b).attr('position'), 10));
} }
function cleanFilePath(filePath) {
if (filePath.slice(-1) === '.') {
filePath = filePath.substring(0, filePath.length - 1);
}
return filePath;
}
function getAssetBytes(folder, stepGuid, fileRef) { function getAssetBytes(folder, stepGuid, fileRef) {
var stepPath = stepGuid ? stepGuid + '/' : ''; var stepPath = stepGuid ? stepGuid + '/' : '';
var filePath = folder + stepPath + fileRef; var filePath = folder + stepPath + fileRef;
var assetBytes = zipFiles.files[filePath].asBinary(); var assetBytes = zipFiles.files[cleanFilePath(filePath)].asBinary();
return window.btoa(assetBytes); return window.btoa(assetBytes);
} }