Skip to content

Commit

Permalink
Merge branch 'pre-staging' of https://github.com/fairdataihub/SODA-fo…
Browse files Browse the repository at this point in the history
…r-SPARC into pre-staging
  • Loading branch information
aaronm-2112 committed Dec 30, 2024
2 parents 4e07af7 + 8426995 commit bf26f8b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion src/renderer/src/scripts/globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -1352,7 +1352,6 @@ var dropdownEventID = "";
window.openDropdownPrompt = async (ev, dropdown, show_timer = true) => {
// if users edit current account
if (dropdown === "bf") {

await window.addBfAccount(ev, false);
} else if (dropdown === "dataset") {
dropdownEventID = ev?.id ?? "";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8065,7 +8065,6 @@ window.guidedResumeProgress = async (datasetNameToResume) => {
if (!datasetHasAlreadyBeenSuccessfullyUploaded) {
// If the dataset is being edited on Pensieve, check to make sure the folders and files are still the same.
if (datasetResumeJsonObj["starting-point"]?.["type"] === "bf") {

// Check to make sure the dataset is not locked
const datasetIsLocked = await api.isDatasetLocked(
window.defaultBfAccount,
Expand Down

0 comments on commit bf26f8b

Please sign in to comment.