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

Merge branch 'soon' into staging

pull/1/head
yflory 2019-09-24 15:13:58 +02:00
parent c36f018939 5e80efda58
commit acae946528
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -788,6 +788,7 @@ define([
getAllStores().forEach(function (s) {
s.manager.getPadAttribute(data, waitFor(function (err, val) {
if (err) { return; }
if (!val || typeof(val) !== "object") { return void console.error("Not an object!"); }
if (!res.value || res.atime < val.atime) {
res.atime = val.atime;
res.value = val.value;

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

@ -741,8 +741,12 @@ define([
cb = cb || function () {};
var sfId = Env.user.userObject.getSFIdFromHref(data.href);
if (sfId) {
var sfData = Env.user.proxy[UserObject.SHARED_FOLDERS][sfId];
setTimeout(function () {
cb(null, Env.user.proxy[UserObject.SHARED_FOLDERS][sfId][data.attr]);
cb(null, {
value: sfData[data.attr],
atime: 1
});
});
return;
}

1
www/share/main.js
View File

@ -94,6 +94,7 @@ define([
password: config.data.password,
isTemplate: config.data.isTemplate,
file: config.data.file,
enableTeams: localStorage.CryptPad_teams === "1",
};
for (var k in additionalPriv) { metaObj.priv[k] = additionalPriv[k]; }