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

Fix shared folders names in the drive

Browse Source
This commit is contained in:
yflory
2018-07-09 18:11:04 +02:00
parent e0cc1a6eb6
commit 6312dadb60
6 changed files with 77 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -677,6 +677,15 @@ define([
return Env.user.userObject.getOwnedPads(edPublic);
};
var getSharedFolderData = function (Env, id) {
if (!Env.folders[id]) { return; }
var obj = Env.folders[id].proxy.metadata || {};
for (var k in Env.user.proxy[UserObject.SHARED_FOLDERS][id] || {}) {
obj[k] = Env.user.proxy[UserObject.SHARED_FOLDERS][id][k];
}
return obj;
};
/* Generic: doesn't need access to a proxy */
var isFile = function (Env, el, allowStr) {
return Env.user.userObject.isFile(el, allowStr);
@@ -762,6 +771,7 @@ define([
getTagsList: callWithEnv(getTagsList),
findFile: callWithEnv(findFile),
findChannels: callWithEnv(findChannels),
getSharedFolderData: callWithEnv(getSharedFolderData),
// Generic
isFile: callWithEnv(isFile),
isFolder: callWithEnv(isFolder),