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

Fix team quota

Browse Source
This commit is contained in:
yflory 2019-11-20 17:15:38 +01:00
parent aa782ba3aa
commit 2b4c3e9e90
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/outer/sharedfolder.js
View File

@ -83,7 +83,7 @@ define([
}; };
SF.load = function (config, id, data, _cb) { SF.load = function (config, id, data, _cb) {
var cb = Util.once(_cb); var cb = Util.once(Util.mkAsync(_cb));
var network = config.network; var network = config.network;
var store = config.store; var store = config.store;
var isNew = config.isNew; var isNew = config.isNew;
@ -189,7 +189,7 @@ define([
return; return;
} }
sf.teams.forEach(function (obj) { sf.teams.forEach(function (obj) {
var leave = function () { SF.leave(secret.channel, teamId); }; var leave = function () { SF.leave(secret.channel, obj.store.id); };
/* /*
var uo = obj.store.manager.addProxy(obj.id, rt, leave, obj.secondaryKey); var uo = obj.store.manager.addProxy(obj.id, rt, leave, obj.secondaryKey);
// NOTE: Shared folder migration, disable for now // NOTE: Shared folder migration, disable for now
@ -301,6 +301,7 @@ define([
*/ */
SF.loadSharedFolders = function (Store, network, store, userObject, waitFor) { SF.loadSharedFolders = function (Store, network, store, userObject, waitFor) {
var shared = Util.find(store.proxy, ['drive', UserObject.SHARED_FOLDERS]) || {}; var shared = Util.find(store.proxy, ['drive', UserObject.SHARED_FOLDERS]) || {};
var w = waitFor();
nThen(function (waitFor) { nThen(function (waitFor) {
Object.keys(shared).forEach(function (id) { Object.keys(shared).forEach(function (id) {
var sf = shared[id]; var sf = shared[id];
@ -311,7 +312,7 @@ define([
}, id, sf, waitFor()); }, id, sf, waitFor());
}); });
}).nThen(function () { }).nThen(function () {
setTimeout(waitFor()); setTimeout(w);
}); });
}; };