diff --git a/src/public/javascripts/dialogs/import.js b/src/public/javascripts/dialogs/import.js index 7125e6ece..47d4608a5 100644 --- a/src/public/javascripts/dialogs/import.js +++ b/src/public/javascripts/dialogs/import.js @@ -50,15 +50,17 @@ async function importIntoNote(importNoteId) { // dialog (which shouldn't happen, but still ...) importId = utils.randomString(10); - const safeImport = $safeImport.is(":checked") ? 1 : 0; + const safeImport = $safeImport.is(":checked") ? "true" : "false"; let noteId; for (const file of files) { const formData = new FormData(); formData.append('upload', file); + formData.append('importId', importId); + formData.append('safeImport', safeImport); - noteId = await $.ajax({ - url: baseApiUrl + 'notes/' + importNoteId + '/import/' + importId + '/safe/' + safeImport, + ({noteId} = await $.ajax({ + url: baseApiUrl + 'notes/' + importNoteId + '/import', headers: server.getHeaders(), data: formData, dataType: 'json', @@ -68,7 +70,7 @@ async function importIntoNote(importNoteId) { processData: false, // NEEDED, DON'T REMOVE THIS }) // we actually ignore the error since it can be caused by HTTP timeout and use WS messages instead. - .fail((xhr, status, error) => {}); + .fail((xhr, status, error) => {})); } $dialog.modal('hide'); diff --git a/src/routes/api/import.js b/src/routes/api/import.js index 80f6a7462..90449af9b 100644 --- a/src/routes/api/import.js +++ b/src/routes/api/import.js @@ -12,9 +12,10 @@ const log = require('../../services/log'); const ImportContext = require('../../services/import_context'); async function importToBranch(req) { - let {parentNoteId, importId, safeImport} = req.params; + const {parentNoteId} = req.params; + let {importId, safeImport} = req.body; - safeImport = safeImport !== '0'; + safeImport = safeImport !== 'false'; const file = req.file; diff --git a/src/routes/routes.js b/src/routes/routes.js index b842c20dd..2d30b7c8a 100644 --- a/src/routes/routes.js +++ b/src/routes/routes.js @@ -129,7 +129,7 @@ function register(app) { apiRoute(PUT, '/api/notes/:noteId/clone-after/:afterBranchId', cloningApiRoute.cloneNoteAfter); route(GET, '/api/notes/:branchId/export/:type/:format/:version/:exportId', [auth.checkApiAuthOrElectron], exportRoute.exportBranch); - route(POST, '/api/notes/:parentNoteId/import/:importId/safe/:safeImport', [auth.checkApiAuthOrElectron, uploadMiddleware], importRoute.importToBranch, apiResultHandler); + route(POST, '/api/notes/:parentNoteId/import', [auth.checkApiAuthOrElectron, uploadMiddleware], importRoute.importToBranch, apiResultHandler); route(POST, '/api/notes/:parentNoteId/upload', [auth.checkApiAuthOrElectron, uploadMiddleware], filesRoute.uploadFile, apiResultHandler);