From 980fd4f61e0fb8086e1ffc9bc5e73c294b5febe4 Mon Sep 17 00:00:00 2001 From: Akuket <32392661+Akuket@users.noreply.github.com> Date: Mon, 16 Jul 2018 12:51:18 +0200 Subject: [PATCH 1/3] Patch Invitation Code --- client/components/settings/invitationCode.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/client/components/settings/invitationCode.js b/client/components/settings/invitationCode.js index a403d8ab8..ce2e9a5be 100644 --- a/client/components/settings/invitationCode.js +++ b/client/components/settings/invitationCode.js @@ -1,6 +1,13 @@ -Template.invitationCode.onRendered(() => { - const setting = Settings.findOne(); - if (!setting || !setting.disableRegistration) { - $('#invitationcode').hide(); - } +Template.invitationCode.onRendered(function() { + Meteor.subscribe('setting', { + onReady : function() { + const setting = Settings.findOne(); + + if (!setting || !setting.disableRegistration) { + $('#invitationcode').hide(); + } + + return this.stop(); + } + }); }); From 1b32509496f14d2d10a598a7005de6d6ced054ca Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 16 Jul 2018 14:46:33 +0300 Subject: [PATCH 2/3] Fix lint errors. --- client/components/settings/invitationCode.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/settings/invitationCode.js b/client/components/settings/invitationCode.js index ce2e9a5be..fa3551798 100644 --- a/client/components/settings/invitationCode.js +++ b/client/components/settings/invitationCode.js @@ -1,6 +1,6 @@ Template.invitationCode.onRendered(function() { Meteor.subscribe('setting', { - onReady : function() { + onReady() { const setting = Settings.findOne(); if (!setting || !setting.disableRegistration) { @@ -8,6 +8,6 @@ Template.invitationCode.onRendered(function() { } return this.stop(); - } + }, }); }); From 7119896a3ca8397568a38c54763578a6e36e8f96 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 16 Jul 2018 14:47:48 +0300 Subject: [PATCH 3/3] - Fix invitation code. Thanks to Akuket and xet7 ! Closes #1749 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04b1e0252..8757b3790 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,11 @@ and fixes the following mobile bugs: - [Hotfix more sortable elements](https://github.com/wekan/wekan/commit/616dade81c25b10fc409aee1bcc9a93ddbfee81b); - [Hotfix for mobile device](https://github.com/wekan/wekan/commit/43d86d7d5d3f3b34b0500f6d5d3afe7bd86b0060). -Thanks to GitHub users adyachok, halunk3, Haocen and xet7 for their contributions. +and fixes the following bugs: + +- [Fix invitation code](https://github.com/wekan/wekan/pull/1777). + +Thanks to GitHub users adyachok, Akuket, halunk3, Haocen and xet7 for their contributions. # v1.18 2018-07-06 Wekan release