The_Great_Archive/cryptpad
1
0
Fork 0
mirror of https://github.com/cryptpad/cryptpad.git synced 2026-09-14 11:05:41 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix SF issues with folders list

Browse Source
This commit is contained in:
yflory 2023-07-05 16:02:07 +03:00
parent 93c0225948
commit a0fdc006f3
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/common/outer/async-store.js
View File

@ -1341,6 +1341,7 @@ define([
all.push({
isShared: false,
name: name,
teamId: s.id,
pathName: 'root',
children: s.manager.getTree()
});

11
www/common/proxy-manager.js
View File

@ -1306,13 +1306,16 @@ define([
var findShared = function (arr) {
arr.forEach(function (el, i) {
if (typeof(el) === "object") { return findShared(el.children); }
if (!Env.folders[el]) { return; }
var d = getSharedFolderData(Env, el);
var sfArr = el.split('|');
var sfId = sfArr[0];
var sfPath = sfArr[1];
if (!Env.folders[sfId]) { return; }
var d = getSharedFolderData(Env, sfId);
arr[i] = {
isShared: true,
name: d.title,
pathName: [el, Env.user.userObject.ROOT],
children: Env.folders[el].userObject.getTree()
pathName: [sfPath, Env.user.userObject.ROOT],
children: Env.folders[sfId].userObject.getTree()
};
});
};

2
www/common/userObject.js
View File

@ -776,7 +776,7 @@ define([
root = root || files[ROOT];
for (var e in root) {
if (isSharedFolder(root[e])) {
tree.push(root[e]);
tree.push(`${root[e]}|${e}`);
} else if (isFolder(root[e])) {
tree.push({
name: e,