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

Fix conflicting curvePublic

Browse Source
This commit is contained in:
yflory
2019-12-18 19:10:30 +01:00
parent 3cd93b1d52
commit e0782d753d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/teams/inner.js
View File

@@ -748,24 +748,28 @@ define([
var me = roster[userData.curvePublic] || {};
var owner = Object.keys(roster).filter(function (k) {
if (roster[k].pending) { return; }
roster[k].curvePublic = k;
return roster[k].role === "OWNER" || roster[k].pendingOwner;
}).map(function (k) {
return makeMember(common, roster[k], me, roster);
});
var admins = Object.keys(roster).filter(function (k) {
if (roster[k].pending) { return; }
roster[k].curvePublic = k;
return roster[k].role === "ADMIN";
}).map(function (k) {
return makeMember(common, roster[k], me);
});
var members = Object.keys(roster).filter(function (k) {
if (roster[k].pending) { return; }
roster[k].curvePublic = k;
return roster[k].role === "MEMBER" || !roster[k].role;
}).map(function (k) {
return makeMember(common, roster[k], me);
});
var viewers = Object.keys(roster).filter(function (k) {
if (roster[k].pending) { return; }
roster[k].curvePublic = k;
return roster[k].role === "VIEWER";
}).map(function (k) {
return makeMember(common, roster[k], me);
@@ -773,6 +777,7 @@ define([
var pending = Object.keys(roster).filter(function (k) {
if (!roster[k].pending) { return; }
if (roster[k].inviteChannel) { return; }
roster[k].curvePublic = k;
return roster[k].role === "MEMBER" || roster[k].role === "VIEWER" || !roster[k].role;
}).map(function (k) {
return makeMember(common, roster[k], me);
@@ -780,6 +785,7 @@ define([
var links = Object.keys(roster).filter(function (k) {
if (!roster[k].pending) { return; }
if (!roster[k].inviteChannel) { return; }
roster[k].curvePublic = k;
return roster[k].role === "VIEWER" || !roster[k].role;
}).map(function (k) {
return makeMember(common, roster[k], me);