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

Fix an issue with new shared folder added to drive from another session

Browse Source
This commit is contained in:
yflory 2018-08-28 14:29:13 +02:00
parent 62817d09cb
commit 0e1c525c30
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/outer/async-store.js
View File

@ -65,6 +65,13 @@ define([
Store.getSharedFolder = function (clientId, id, cb) { Store.getSharedFolder = function (clientId, id, cb) {
if (store.manager.folders[id]) { if (store.manager.folders[id]) {
return void cb(store.manager.folders[id].proxy); return void cb(store.manager.folders[id].proxy);
} else {
var shared = Util.find(store.proxy, ['drive', UserObject.SHARED_FOLDERS]) || {};
if (shared[id]) {
return void Store.loadSharedFolder(id, shared[id], function () {
cb(store.manager.folders[id].proxy);
});
}
} }
cb({}); cb({});
}; };
@ -1165,7 +1172,7 @@ define([
}; };
// SHARED FOLDERS // SHARED FOLDERS
var loadSharedFolder = function (id, data, cb) { var loadSharedFolder = Store.loadSharedFolder = function (id, data, cb) {
var parsed = Hash.parsePadUrl(data.href); var parsed = Hash.parsePadUrl(data.href);
var secret = Hash.getSecrets('drive', parsed.hash, data.password); var secret = Hash.getSecrets('drive', parsed.hash, data.password);
var owners = data.owners; var owners = data.owners;

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

@ -370,7 +370,7 @@ define([
cb(obj); cb(obj);
}); });
}; };
// Add a folder/subfolder // Add a shared folder
var _addSharedFolder = function (Env, data, cb) { var _addSharedFolder = function (Env, data, cb) {
data = data || {}; data = data || {};
var resolved = _resolvePath(Env, data.path); var resolved = _resolvePath(Env, data.path);