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
Show Stats 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', className: 'primary',
name: Messages.forgetButton, name: Messages.forgetButton,
onClick: function () { onClick: function () {
manager.delete([['sharedFoldersTemp', fId]], function () { manager.delete([['sharedFoldersTemp', fId]], function () { });
});
}, },
keys: [] keys: []
}, { }, {
@ -4478,8 +4477,12 @@ define([
}; };
if (typeof (deprecated) === "object") { if (typeof (deprecated) === "object") {
Object.keys(deprecated).forEach(function (fId) { Object.keys(deprecated).forEach(function (fId) {
nt = nt(function (waitFor) {
var data = deprecated[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) {
UI.openCustomModal(passwordModal(fId, data, waitFor())); UI.openCustomModal(passwordModal(fId, data, waitFor()));
}).nThen; }).nThen;
}); });

20
www/common/outer/userObject.js
View File

@ -734,10 +734,6 @@ define([
var fixSharedFolders = function () { var fixSharedFolders = function () {
if (sharedFolder) { return; } if (sharedFolder) { return; }
if (typeof(files[SHARED_FOLDERS]) !== "object") { debug("SHARED_FOLDER was not an object"); files[SHARED_FOLDERS] = {}; } if (typeof(files[SHARED_FOLDERS]) !== "object") { debug("SHARED_FOLDER was not an object"); files[SHARED_FOLDERS] = {}; }
if (typeof(files[SHARED_FOLDERS_TEMP]) !== "object") {
debug("SHARED_FOLDER_TEMP was not an object");
files[SHARED_FOLDERS_TEMP] = {};
}
var sf = files[SHARED_FOLDERS]; var sf = files[SHARED_FOLDERS];
var rootFiles = exp.getFiles([ROOT]); var rootFiles = exp.getFiles([ROOT]);
var root = exp.find([ROOT]); var root = exp.find([ROOT]);
@ -762,6 +758,21 @@ define([
} }
} }
}; };
var fixSharedFoldersTemp = function () {
if (sharedFolder) { return; }
if (typeof(files[SHARED_FOLDERS_TEMP]) !== "object") {
debug("SHARED_FOLDER_TEMP was not an object");
files[SHARED_FOLDERS_TEMP] = {};
}
// Remove deprecated shared folder if they were already added back
var sft = files[SHARED_FOLDERS_TEMP];
var sf = files[SHARED_FOLDERS];
for (var id in sft) {
if (sf[id]) {
delete sft[id];
}
}
};
var fixDrive = function () { var fixDrive = function () {
@ -776,6 +787,7 @@ define([
fixFilesData(); fixFilesData();
fixDrive(); fixDrive();
fixSharedFolders(); fixSharedFolders();
fixSharedFoldersTemp();
if (JSON.stringify(files) !== before) { if (JSON.stringify(files) !== before) {
debug("Your file system was corrupted. It has been cleaned so that the pads you visit can be stored safely"); debug("Your file system was corrupted. It has been cleaned so that the pads you visit can be stored safely");