infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Update shared folder owners locally when offering ownership

pull/1/head
yflory 2019-10-29 11:16:46 +01:00
parent a77d2da47c
commit 77c6269e0c
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,9 +82,11 @@ define([
// All occurences are returned, in drive or shared folders
var findChannel = function (Env, channel) {
var ret = [];
Env.user.userObject.findChannels([channel]).forEach(function (id) {
Env.user.userObject.findChannels([channel], true).forEach(function (id) {
var data = Env.user.proxy[UserObject.SHARED_FOLDERS][id] ||
Env.user.userObject.getFileData(id);
ret.push({
data: Env.user.userObject.getFileData(id),
data: data,
userObject: Env.user.userObject
});
});

9
www/common/userObject.js
View File

@ -492,10 +492,13 @@ define([
};
// Get drive ids of files from their channel ids
exp.findChannels = function (channels) {
exp.findChannels = function (channels, includeSharedFolders) {
var allFilesList = files[FILES_DATA];
return getFiles([FILES_DATA]).filter(function (k) {
var data = allFilesList[k];
var sfList = files[SHARED_FOLDERS];
var paths = [FILES_DATA];
if (includeSharedFolders) { paths.push(SHARED_FOLDERS); }
return getFiles(paths).filter(function (k) {
var data = allFilesList[k] || sfList[k] || {};
return channels.indexOf(data.channel) !== -1;
});
};