diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-07-16 14:48:46 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-07-16 14:48:46 +0300 |
commit | 1a7796f2cab27897ebf4db8d11d2851b6bb9df7d (patch) | |
tree | c5ff511df10c5048c993dbd1fe8013e630c3c8bb | |
parent | d8c62cf242c6f90473bd4edaa1ae8812726e0dab (diff) | |
parent | 7119896a3ca8397568a38c54763578a6e36e8f96 (diff) | |
download | wekan-1a7796f2cab27897ebf4db8d11d2851b6bb9df7d.tar.gz wekan-1a7796f2cab27897ebf4db8d11d2851b6bb9df7d.tar.bz2 wekan-1a7796f2cab27897ebf4db8d11d2851b6bb9df7d.zip |
Merge branch 'Akuket-devel' into devel
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | client/components/settings/invitationCode.js | 17 |
2 files changed, 17 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 04b1e025..8757b379 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 diff --git a/client/components/settings/invitationCode.js b/client/components/settings/invitationCode.js index a403d8ab..fa355179 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() { + const setting = Settings.findOne(); + + if (!setting || !setting.disableRegistration) { + $('#invitationcode').hide(); + } + + return this.stop(); + }, + }); }); |