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 5f06504ec59be2484bab8608de6f816a746b4646 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Oct 17 14:22:58 2017 +0200 ne pas initilaiser la date de premium, ne pas enregistrer le droit de création de sondage si l'option n'est pas active. --- pollen-ui-riot-js/src/main/web/tag/admin/UserEditModal.tag.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/admin/UserEditModal.tag.html b/pollen-ui-riot-js/src/main/web/tag/admin/UserEditModal.tag.html index 77c3a77d..9cc803dc 100644 --- a/pollen-ui-riot-js/src/main/web/tag/admin/UserEditModal.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/admin/UserEditModal.tag.html @@ -108,7 +108,10 @@ require("../components/UserEmailAddressList.tag.html"); let moment = require("moment-timezone"); this.errors = {}; - this.premiumTo = {date: moment(this.opts.user.premiumTo)}; + this.premiumTo = {}; + if (this.opts.user.premiumTo) { + this.premiumTo.date = moment(this.opts.user.premiumTo); + } this.open = () => { return this.refs.modal.open(); @@ -119,7 +122,7 @@ require("../components/UserEmailAddressList.tag.html"); user2.name = this.refs.modal.refs.name.value; user2.administrator = this.refs.modal.refs.administrator.checked; user2.banned = this.refs.modal.refs.banned.checked; - user2.canCreatePoll = this.refs.modal.refs.canCreatePoll.checked; + user2.canCreatePoll = this.pollCreatorEnable ? this.refs.modal.refs.canCreatePoll.checked : this.opts.user.canCreatePoll; user2.premiumTo = this.refs.modal.refs.premiumTo.getValue(); return userService.saveUser(user2).then(() => { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.