Get folders list syntax update

This commit is contained in:
yflory 2023-07-05 15:51:33 +03:00
parent 73a6d4dee5
commit b0aca0c924
3 changed files with 28 additions and 19 deletions

View File

@ -1329,16 +1329,21 @@ define([
};
Store.getFoldersList = function (clientId, data, cb) {
var all = {};
var all = [];
var teamModule = store.modules['team'];
var allTeams = teamModule.getTeamsData();
getAllStores().forEach(function (s) {
var key = "MyDrive"; // XXX
var name = "MyDrive"; // XXX
if (s.id) {
if (allTeams[s.id]) { key = allTeams[s.id].name; }
if (allTeams[s.id]) { name = allTeams[s.id].name; }
else { return; }
}
all[key] = s.manager.getTree(cb);
all.push({
isShared: false,
name: name,
pathName: 'root',
children: s.manager.getTree()
});
});
cb(all);
};

View File

@ -1302,19 +1302,17 @@ define([
};
var getTree = function (Env) {
var tree = {};
Env.user.userObject.getTree(tree);
var findShared = function (obj) {
Object.keys(obj).forEach(function (key) {
var el = obj[key];
if (typeof(el) === "object") { return findShared(el); }
var tree = Env.user.userObject.getTree();
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 t = obj[key] = {};
Env.folders[el].userObject.getTree(t);
t[Util.uid()] = {
sf: true,
title: d.title
arr[i] = {
isShared: true,
name: d.title,
pathName: [el, Env.user.userObject.ROOT],
children: Env.folders[el].userObject.getTree()
};
});
};

View File

@ -771,16 +771,22 @@ define([
};
// Get tree with folders only
exp.getTree = function (tree, root) {
exp.getTree = function (root) {
var tree = [];
root = root || files[ROOT];
for (var e in root) {
if (isSharedFolder(root[e])) {
tree[e] = root[e];
tree.push(root[e]);
} else if (isFolder(root[e])) {
tree[e] = {};
exp.getTree(tree[e], root[e]);
tree.push({
name: e,
pathName: e,
isShared: false,
children: exp.getTree(root[e])
});
}
}
return tree;
};
/**