dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix UI issues with team invitation links

This commit is contained in:
yflory 2022-12-07 15:03:55 +01:00
parent fb079c49bf
commit ad0c2e90dc
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1043,6 +1043,7 @@ define([
var member = members[curve];
if (!member.inviteChannel) { return; }
if (!member.hash) { return; }
if (!teamData.hash) { delete member.hash; return; }
try {
member.hash = Invite.decryptHash(member.hash, teamData.hash);
} catch (e) { console.error(e); }

20
www/teams/inner.js
View File

@ -834,14 +834,16 @@ define([
status,
];
if (data.inviteChannel) {
var copy = h('span.fa.fa-copy');
$(copy).click(function () {
var privateData = common.getMetadataMgr().getPrivateData();
var origin = privateData.origin;
var href = origin + Hash.hashToHref(data.hash, 'teams');
var success = Clipboard.copy(href);
if (success) { UI.log(Messages.shareSuccess); }
}).prependTo(actions);
if (data.hash) {
var copy = h('span.fa.fa-copy');
$(copy).click(function () {
var privateData = common.getMetadataMgr().getPrivateData();
var origin = privateData.origin;
var href = origin + Hash.hashToHref(data.hash, 'teams');
var success = Clipboard.copy(href);
if (success) { UI.log(Messages.shareSuccess); }
}).prependTo(actions);
}
content = [
avatar,
name,
@ -1380,7 +1382,7 @@ define([
Messages._getKey('team_inviteFromMsg',
[Util.fixHTML(getDisplayName(json.author.displayName)),
Util.fixHTML(json.teamName)])));
if (typeof(json.message) === 'string') {
if (typeof(json.message) === 'string' && json.message) {
var message = h('div.cp-teams-invite-message');
json.message.split('\n').forEach(line => {
if (line.trim()) {