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

PCS with owners and password for spreadsheets

Browse Source
This commit is contained in:
yflory
2019-02-05 15:58:49 +01:00
parent a0049b360a
commit 412670c8a6
8 changed files with 77 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -490,13 +490,13 @@ define([
});
}
uo.delete(resolved.main, waitFor(function (err, _toUnpin, _ownedRemoved) {
ownedRemoved = _ownedRemoved;
if (!Env.unpinPads || !_toUnpin) { return; }
Array.prototype.push.apply(toUnpin, _toUnpin);
ownedRemoved = _ownedRemoved;
}));
}
}).nThen(function (waitFor) {
// Check if removed owned pads are duplicated is some shared folders
// Check if removed owned pads are duplicated in some shared folders
// If that's the case, we have to remove them from the shared folders too
// We can do that by adding their paths to the list of pads to remove from shared folders
if (ownedRemoved) {
@@ -526,8 +526,13 @@ define([
// Deleted channels
toUnpin = Util.deduplicateString(toUnpin);
// Deleted channels that are still in another proxy
var toKeep = _findChannels(Env, toUnpin).map(function (id) {
return _getFileData(Env, id).channel;
var toKeep = [];
_findChannels(Env, toUnpin).forEach(function (id) {
var data = _getFileData(Env, id);
var arr = [data.channel];
if (data.rtChannel) { arr.push(data.rtChannel); }
if (data.lastVersion) { arr.push(Hash.hrefToHexChannelId(data.lastVersion)); }
Array.prototype.push.apply(toKeep, arr);
});
// Compute the unpin list and unpin
var unpinList = [];
@@ -715,6 +720,9 @@ define([
result.push(otherChan);
}
}
if (data.rtChannel && result.indexOf(data.rtChannel) === -1) {
result.push(data.rtChannel);
}
if (result.indexOf(data.channel) === -1) {
result.push(data.channel);
}