Merge branch 'ro' into filePassword

2019-11-08 15:28:35 +01:00
parent b0f5254942 5290bcf791
commit 8e403c4f46
7 changed files with 49 additions and 26 deletions
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -915,7 +915,7 @@ define([
            // config.teamId only exists when we're trying to share a pad from a team drive
            // In this case, we don't want to share the pad with the current team
            if (config.teamId && config.teamId === id) { return; }
-            if (!teamsData[id].secondaryKey) { return; }
+            if (!teamsData[id].hasSecondaryKey) { return; }
            var t = teamsData[id];
            teams[t.edPublic] = {
                notifications: true,