branch develop updated (ac074ae -> b5474b1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from ac074ae Ajout d'un panel pour afficher des erreurs new 0dfb832 ajout de contributeurs new b5474b1 déplacement des traductions dans les tags The 2 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 b5474b149d63e6ca25c9028902c0d63071f58476 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 18 17:54:08 2017 +0200 déplacement des traductions dans les tags commit 0dfb832808172a810e1342958ecf2a360e44eafd Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 18 17:53:36 2017 +0200 ajout de contributeurs Summary of changes: pollen-ui-riot-js/package.json | 10 ++++++++++ pollen-ui-riot-js/src/main/web/i18n.json | 3 ++- pollen-ui-riot-js/src/main/web/js/Poll.js | 3 --- pollen-ui-riot-js/src/main/web/tag/PollenErrorManager.tag.html | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 4 +++- 5 files changed, 16 insertions(+), 6 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 0dfb832808172a810e1342958ecf2a360e44eafd Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 18 17:53:36 2017 +0200 ajout de contributeurs --- pollen-ui-riot-js/package.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pollen-ui-riot-js/package.json b/pollen-ui-riot-js/package.json index 25f3bbf..750102a 100644 --- a/pollen-ui-riot-js/package.json +++ b/pollen-ui-riot-js/package.json @@ -13,6 +13,16 @@ "email": "dev@tchemit.fr", "url": "http://ultreia.io" }, + "contributors": [ + { + "name": "Sylvain Bavencoff", + "email": "bavencoff@codelutin.com" + }, + { + "name": "Kevin Morin", + "email": "morin@codelutin.com" + } + ], "scripts": { "start": "./node_modules/.bin/webpack-dev-server --hot --inline --host 0.0.0.0", "package": "./node_modules/.bin/webpack" -- 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 develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit b5474b149d63e6ca25c9028902c0d63071f58476 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 18 17:54:08 2017 +0200 déplacement des traductions dans les tags --- pollen-ui-riot-js/src/main/web/i18n.json | 3 ++- pollen-ui-riot-js/src/main/web/js/Poll.js | 3 --- pollen-ui-riot-js/src/main/web/tag/PollenErrorManager.tag.html | 2 +- pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html | 4 +++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/i18n.json b/pollen-ui-riot-js/src/main/web/i18n.json index 34e36ce..2d4118f 100644 --- a/pollen-ui-riot-js/src/main/web/i18n.json +++ b/pollen-ui-riot-js/src/main/web/i18n.json @@ -2,6 +2,7 @@ "fr": { "pagination_all": "Tous", "pagination_resultsPerPage": "Résultats par page", + "poll_403": "Erreur : le sondage n'est pas accessible", "poll_closePoll": "Clôturer le sondage", "poll_reopenPoll": "Réouvrir le sondage", "poll_deletePoll": "Supprimer le sondage", @@ -356,12 +357,12 @@ "favoriteList_member_ldap_placeholder": "L'adresse de l'annuaire LDAP", "favoriteList_member_add": "Ajouter", "error_manager_403": "Erreur : Accès refusé", - "error_manager_poll_403": "Erreur : le sondage n'est pas accessible", "error_manager_500": "Erreur : Service indisponible" }, "en": { "pagination_all": "All", "pagination_resultsPerPage": "Results per page", + "poll_403": "Error : the poll is not available", "poll_choices": "Choices", "poll_votes": "Votes", "poll_settings": "Settings", diff --git a/pollen-ui-riot-js/src/main/web/js/Poll.js b/pollen-ui-riot-js/src/main/web/js/Poll.js index 0524bc6..b63720f 100644 --- a/pollen-ui-riot-js/src/main/web/js/Poll.js +++ b/pollen-ui-riot-js/src/main/web/js/Poll.js @@ -36,9 +36,6 @@ class Poll { this.results = undefined; bus.trigger("poll", this); return Promise.resolve(this); - }, - (error) => { - bus.trigger("error", new Error("poll_" + error.status)); }); return this._initPromise; diff --git a/pollen-ui-riot-js/src/main/web/tag/PollenErrorManager.tag.html b/pollen-ui-riot-js/src/main/web/tag/PollenErrorManager.tag.html index be3e39a..d5b0d48 100644 --- a/pollen-ui-riot-js/src/main/web/tag/PollenErrorManager.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/PollenErrorManager.tag.html @@ -2,7 +2,7 @@ <div each={error in errors} class="pollen-error" id="{error.id}"> <div class="close-error" onclick="{closeError(error.id)}"><i class="fa fa-times" aria-hidden="true"></i></div> - {_l(error.message)} + {error.message} </div> <style> diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html index e18412d..a9ddba5 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Poll.tag.html @@ -176,7 +176,9 @@ require("../popup/QrCodeButton.tag.html"); }; this.bus.on("poll", this.onPollChange); - this.poll.init(this.opts.pollId, this.opts.voteId, this.opts.permission); + this.poll.init(this.opts.pollId, this.opts.voteId, this.opts.permission).catch((error) => { + this.bus.trigger("error", new Error(this._l(error.status))); + }); this.closePoll = (e) => { e.preventDefault(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm