Skip to content
This repository has been archived by the owner on Dec 25, 2023. It is now read-only.

Commit

Permalink
Repair import from server (again)
Browse files Browse the repository at this point in the history
  • Loading branch information
nagmat84 committed Sep 28, 2022
1 parent a9f5ba1 commit f181f2c
Showing 1 changed file with 1 addition and 15 deletions.
16 changes: 1 addition & 15 deletions scripts/main/upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -690,21 +690,7 @@ upload.start = {
*/

/** @param {ServerImportDialogResult} data */
const action = function (data) {
if (!data.paths.trim()) {
basicModal.error("paths");
return;
} else {
// Consolidate `data` before we close the modal dialog
// TODO: We should fix the modal dialog to properly return the values of all input fields, incl. check boxes
data.paths = data.paths.match(/(?:\\.|\S)+/g);
data.delete_imported = !!$(choiceDeleteSelector).prop("checked");
data.import_via_symlink = !!$(choiceSymlinkSelector).prop("checked");
data.skip_duplicates = !!$(choiceDuplicateSelector).prop("checked");
data.resync_metadata = !!$(choiceResyncSelector).prop("checked");
basicModal.close();
}

const importFromServer = function (data) {
let isUploadCancelled = false;

const cancelUpload = function () {
Expand Down

0 comments on commit f181f2c

Please sign in to comment.