web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix shared folder duplication bug

Browse Source
This commit is contained in:
yflory
2019-10-21 17:26:52 +02:00
parent 51b1c19e77
commit efded1063f
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/drive-ui.js
View File

@@ -4461,8 +4461,7 @@ define([
className: 'primary',
name: Messages.forgetButton,
onClick: function () {
manager.delete([['sharedFoldersTemp', fId]], function () {
});
manager.delete([['sharedFoldersTemp', fId]], function () { });
},
keys: []
}, {
@@ -4478,8 +4477,12 @@ define([
};
if (typeof (deprecated) === "object") {
Object.keys(deprecated).forEach(function (fId) {
var data = deprecated[fId];
var sfId = manager.user.userObject.getSFIdFromHref(data.href);
if (folders[fId] || sfId) { // This shared folder is already stored in the drive...
return void manager.delete([['sharedFoldersTemp', fId]], function () { });
}
nt = nt(function (waitFor) {
var data = deprecated[fId];
UI.openCustomModal(passwordModal(fId, data, waitFor()));
}).nThen;
});