dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Shared FOlder issues in the drive

This commit is contained in:
yflory 2020-10-27 10:41:35 +01:00 committed by ansuz
parent 1f1b40b83d
commit 8de5ce4351
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4549,6 +4549,9 @@ define([
var rEl = manager.find(restorePath); var rEl = manager.find(restorePath);
if (manager.isFile(rEl)) { if (manager.isFile(rEl)) {
restoreName = manager.getTitle(rEl); restoreName = manager.getTitle(rEl);
} else if (manager.isSharedFolder(rEl)) {
var sfData = manager.getSharedFolderData(rEl);
restoreName = sfData.title || sfData.lastTitle || Messages.fm_deletedFolder;
} else { } else {
restoreName = restorePath[1]; restoreName = restorePath[1];
} }

3
www/common/userObject.js
View File

@ -846,7 +846,8 @@ define([
}; };
exp.ownedInTrash = function (isOwned) { exp.ownedInTrash = function (isOwned) {
return getFiles([TRASH]).map(function (id) { return getFiles([TRASH]).map(function (id) {
var data = exp.getFileData(id); var data = isSharedFolder(id) ? files[SHARED_FOLDERS][id] : exp.getFileData(id);
if (!data) { return; }
return isOwned(data.owners) ? data.channel : undefined; return isOwned(data.owners) ? data.channel : undefined;
}).filter(Boolean); }).filter(Boolean);
}; };