Skip to content

Commit b16fe5b

Browse files
committed
[skip ci] ask for permissino change
1 parent 3b872d0 commit b16fe5b

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

services/static-webserver/client/source/class/osparc/dashboard/DragDropHelpers.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ qx.Class.define("osparc.dashboard.DragDropHelpers", {
161161
const folderOrigin = event.getData("osparc-moveFolder")["folderOrigin"];
162162
const folderToFolderData = {
163163
folderId: folderOrigin.getFolderId(),
164+
workspaceId: folderOrigin.getWorkspaceId(),
164165
destWorkspaceId,
165166
destFolderId,
166167
};

services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -583,27 +583,22 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
583583
const data = e.getData();
584584
const destWorkspaceId = data["workspaceId"];
585585
const destFolderId = data["folderId"];
586-
if (destWorkspaceId === currentWorkspaceId) {
587-
this.__doMoveFolder(folderId, destWorkspaceId, destFolderId);
588-
} else {
589-
const confirmationWin = this.__showMoveToWorkspaceWarningMessage();
590-
confirmationWin.addListener("close", () => {
591-
if (confirmationWin.getConfirmed()) {
592-
this.__doMoveFolder(folderId, destWorkspaceId, destFolderId);
593-
}
594-
}, this);
595-
}
586+
this._folderToFolderRequested(folderId, currentWorkspaceId, destWorkspaceId, destFolderId);
596587
});
597588
moveFolderTo.addListener("cancel", () => win.close());
598589
},
599590

600-
_folderToFolderRequested: function(data) {
601-
const {
602-
folderId,
603-
destWorkspaceId,
604-
destFolderId,
605-
} = data;
606-
this.__doMoveFolder(folderId, destWorkspaceId, destFolderId);
591+
_folderToFolderRequested: function(folderId, workspaceId, destWorkspaceId, destFolderId) {
592+
if (destWorkspaceId === workspaceId) {
593+
this.__doMoveFolder(folderId, destWorkspaceId, destFolderId);
594+
} else {
595+
const confirmationWin = this.__showMoveToWorkspaceWarningMessage();
596+
confirmationWin.addListener("close", () => {
597+
if (confirmationWin.getConfirmed()) {
598+
this.__doMoveFolder(folderId, destWorkspaceId, destFolderId);
599+
}
600+
}, this);
601+
}
607602
},
608603

609604
__folderToTrash: function(folderId) {
@@ -1183,7 +1178,13 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
11831178
this._studyToFolderRequested(e.getData());
11841179
});
11851180
workspacesAndFoldersTree.addListener("folderToFolderRequested", e => {
1186-
this._folderToFolderRequested(e.getData());
1181+
const {
1182+
folderId,
1183+
workspaceId,
1184+
destWorkspaceId,
1185+
destFolderId,
1186+
} = e.getData();
1187+
this._folderToFolderRequested(folderId, workspaceId, destWorkspaceId, destFolderId);
11871188
});
11881189

11891190
this._resourceFilter.addListener("trashStudyRequested", e => {

0 commit comments

Comments
 (0)