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

Fix default category after joining a team

Browse Source
This commit is contained in:
yflory 2019-12-18 12:42:24 +01:00
parent efa56e5fbc
commit 8eed376274
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/common-ui-elements.js
View File

@ -1701,7 +1701,7 @@ define([
var $nav = $linkContent.closest('.alertify').find('nav'); var $nav = $linkContent.closest('.alertify').find('nav');
$(linkError).text('').hide(); $(linkError).text('').hide();
var name = $(linkName).val(); var name = $(linkName).val();
var pw = $(linkPassword).val(); var pw = $(linkPassword).find('input').val();
var msg = $(linkMessage).val(); var msg = $(linkMessage).val();
var hash = Hash.createRandomHash('invite', pw); var hash = Hash.createRandomHash('invite', pw);
var hashData = Hash.parseTypeHash('invite', hash); var hashData = Hash.parseTypeHash('invite', hash);

4
www/teams/inner.js
View File

@ -184,7 +184,7 @@ define([
var $categories = $('<div>', {'class': 'cp-sidebarlayout-categories'}) var $categories = $('<div>', {'class': 'cp-sidebarlayout-categories'})
.appendTo(APP.$leftside); .appendTo(APP.$leftside);
var hash = common.getMetadataMgr().getPrivateData().teamInviteHash; var hash = common.getMetadataMgr().getPrivateData().teamInviteHash && mainCategories.link;
var categories = team ? teamCategories : mainCategories; var categories = team ? teamCategories : mainCategories;
var active = team ? 'drive' : (hash ? 'link' : 'list'); var active = team ? 'drive' : (hash ? 'link' : 'list');
@ -1051,6 +1051,7 @@ define([
}; };
refreshLink = function (common, cb) { refreshLink = function (common, cb) {
if (!mainCategories.link) { return; }
var privateData = common.getMetadataMgr().getPrivateData(); var privateData = common.getMetadataMgr().getPrivateData();
var hash = privateData.teamInviteHash; var hash = privateData.teamInviteHash;
var hashData = Hash.parseTypeHash('invite', hash); var hashData = Hash.parseTypeHash('invite', hash);
@ -1133,6 +1134,7 @@ define([
if ($divLink.length) { if ($divLink.length) {
$divLink.remove(); $divLink.remove();
$('div.cp-team-cat-link').remove(); $('div.cp-team-cat-link').remove();
delete mainCategories.link;
} }
}); });
var $divCreate = $('div.cp-team-create'); var $divCreate = $('div.cp-team-create');