branch hotfix/3.0.1 updated (ff9fe24e -> 567aa0d1)
This is an automated email from the git hooks/post-receive script. New change to branch hotfix/3.0.1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from ff9fe24e Correction des traductions new 45e53c95 correction du pattern vide du choix new bf5ac4c4 fixes #156 I cannot edit my vote in a restricted poll new 567aa0d1 fixes #154 The icons to log in through 3rd party providers do not display if I want to log in after my token expires The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 567aa0d138e77fb4d5d6a9de234f417def067b63 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 2 15:15:57 2017 +0200 fixes #154 The icons to log in through 3rd party providers do not display if I want to log in after my token expires commit bf5ac4c41b46f1dedd53f9c33c46b4dc413cd99e Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 2 15:15:07 2017 +0200 fixes #156 I cannot edit my vote in a restricted poll commit 45e53c9596eee7d884ae28e4df2ed7df61330468 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 2 15:10:30 2017 +0200 correction du pattern vide du choix Summary of changes: pollen-ui-riot-js/src/main/web/js/Session.js | 2 ++ pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 11 ++++++++++- pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch hotfix/3.0.1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 45e53c9596eee7d884ae28e4df2ed7df61330468 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 2 15:10:30 2017 +0200 correction du pattern vide du choix --- pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html index 46a9cacc..f3acb26e 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Choice.tag.html @@ -38,7 +38,7 @@ require("../components/time-picker.tag.html"); disabled={opts.disabled} value={valueText} required={opts.choice.choiceType === 'TEXT'} - pattern={opts.choice.choiceType === 'TEXT' ? ".*[^\s]+.*" : ""} + pattern={opts.choice.choiceType === 'TEXT' ? ".*[^\\s]+.*" : ""} maxlength="255" title={__.text_notBlank} onchange={onTextChange}/> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch hotfix/3.0.1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit bf5ac4c41b46f1dedd53f9c33c46b4dc413cd99e Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 2 15:15:07 2017 +0200 fixes #156 I cannot edit my vote in a restricted poll --- pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html index fec772d8..14f693d0 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Votes.tag.html @@ -87,7 +87,7 @@ require("../components/LazyLoad.tag.html"); </span> </div> </div> - <div class="footer separator-top" if="{loaded && poll.canVote}"> + <div class="footer separator-top" if="{loaded && (poll.canVote || voteInEdition)}"> <div class="current-voter-actions separator-right"> <div class="current-voter-buttons"> <button if={!voteInEdition} -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch hotfix/3.0.1 in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 567aa0d138e77fb4d5d6a9de234f417def067b63 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 2 15:15:57 2017 +0200 fixes #154 The icons to log in through 3rd party providers do not display if I want to log in after my token expires --- pollen-ui-riot-js/src/main/web/js/Session.js | 2 ++ pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pollen-ui-riot-js/src/main/web/js/Session.js b/pollen-ui-riot-js/src/main/web/js/Session.js index 251dcd1c..4b0a4df3 100644 --- a/pollen-ui-riot-js/src/main/web/js/Session.js +++ b/pollen-ui-riot-js/src/main/web/js/Session.js @@ -99,6 +99,8 @@ class Session { var oldUser = this.user; this.user = user; bus.trigger("user", user, oldUser); + }).catch(() => { + bus.trigger("userNoMoreConnected"); }); } } diff --git a/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html b/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html index 3d1c9140..fa32e861 100644 --- a/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/SignIn.tag.html @@ -85,12 +85,21 @@ require("./components/HumanInput.tag.html"); this.authService = require("../js/AuthService"); this.loginProviders = []; + + this.listen("userNoMoreConnected", () => { + this.updateLoginProviders(); + }); + this.on("mount", () => { + this.updateLoginProviders(); + }); + + this.updateLoginProviders = () => { this.authService.getActiveLoginProviders().then((result) => { this.loginProviders = result; this.update(); }); - }); + }; this.newPassword = () => { this.refs.newPassword.open(this.refs.login.value || ""); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm