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

Fix a race condition in teams

Browse Source
This commit is contained in:
yflory
2019-10-01 11:33:42 +02:00
parent f341ac2637
commit 50e39f9945
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/teams/inner.js
View File

@@ -452,7 +452,8 @@ define([
// Name
var name = h('span.cp-team-member-name', data.displayName);
if (data.pendingOwner) {
$(name).append(h('em', " PENDING"));
$(name).append(h('em', " PENDING")); // XXX
// + XXX ability to demote yourself as owner if there is another owner
}
// Status
var status = h('span.cp-team-member-status'+(data.online ? '.online' : ''));
@@ -468,9 +469,9 @@ define([
title: Messages.team_rosterPromoteOwner
});
$(promoteOwner).click(function () {
$(promoteOwner).hide();
UI.confirm(Messages.team_ownerConfirm, function (yes) {
if (!yes) { return; }
$(promoteOwner).hide();
APP.module.execCommand('OFFER_OWNERSHIP', {
teamId: APP.team,
curvePublic: data.curvePublic