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

Fix team editor

Browse Source
This commit is contained in:
yflory
2019-10-10 13:56:12 +02:00
parent d3b03f46ea
commit 13df7e8d38
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -550,9 +550,9 @@ define([
};
// Get the metadata for sframe-common-outer
Store.getMetadata = function (clientId, data, cb) {
Store.getMetadata = function (clientId, app, cb) {
var disableThumbnails = Util.find(store.proxy, ['settings', 'general', 'disableThumbnails']);
var teams = store.modules['team'] && store.modules['team'].getTeamsData();
var teams = store.modules['team'] && store.modules['team'].getTeamsData(app);
var metadata = {
// "user" is shared with everybody via the userlist
user: {

10
www/common/outer/team.js
View File

@@ -253,12 +253,13 @@ define([
rt: team.realtime,
editKey: secret && secret.keys.secondaryKey
});
team.secondaryKey = secret && secret.keys.secondaryKey;
team.userObject = manager.user.userObject;
team.userObject.fixFiles();
}).nThen(function (waitFor) {
ctx.teams[id] = team;
registerChangeEvents(ctx, team, proxy);
SF.checkMigration(secret && secret.keys.secondaryKey, proxy, team.userObject, waitFor());
SF.checkMigration(team.secondaryKey, proxy, team.userObject, waitFor());
SF.loadSharedFolders(ctx.Store, ctx.store.network, team, team.userObject, waitFor);
}).nThen(function () {
if (!team.rpc) { return; }
@@ -1109,8 +1110,10 @@ define([
team.getTeam = function (id) {
return ctx.teams[id];
};
team.getTeamsData = function () {
team.getTeamsData = function (app) {
var t = {};
var safe = false;
if (['drive', 'teams', 'settings'].indexOf(app) !== -1) { safe = true; }
Object.keys(teams).forEach(function (id) {
t[id] = {
owner: teams[id].owner,
@@ -1118,6 +1121,9 @@ define([
edPublic: Util.find(teams[id], ['keys', 'drive', 'edPublic']),
avatar: Util.find(teams[id], ['metadata', 'avatar'])
};
if (safe) {
t[id].secondaryKey = ctx.teams[id].secondaryKey;
}
});
return t;
};