branch develop updated (587105ce -> 41112819)
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 587105ce limitation de l'espace mémoire de l'API REST new 7544d0da autocomplete off sur la répétition du mot de passe new bd136129 ajout du filtre de login sur l'url root new acb3f0f8 fixes #169 Suggest all the user's email addresses when he creates a poll new 41112819 corrections linter The 4 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 41112819c70fb2d13ca95c66833e730e49797b64 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 27 11:00:53 2017 +0200 corrections linter commit acb3f0f81969e6a8ee3387c3c9e20608719c39d8 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 27 11:00:23 2017 +0200 fixes #169 Suggest all the user's email addresses when he creates a poll commit bd1361299dbd4a5e113274caf4a35da41cc230cb Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 27 10:58:02 2017 +0200 ajout du filtre de login sur l'url root commit 7544d0da31fa95e1d2440cdd291972664bbd9e39 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 27 10:57:17 2017 +0200 autocomplete off sur la répétition du mot de passe Summary of changes: pollen-ui-riot-js/src/main/web/js/AuthService.js | 26 +++++++++++----------- .../src/main/web/tag/FilterLoginProvider.tag.js | 2 +- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 ++ .../src/main/web/tag/UserProfile.tag.html | 24 ++++++++++---------- .../tag/components/UserEmailAddressList.tag.html | 12 +++++----- .../src/main/web/tag/poll/Description.tag.html | 12 ++++++---- 6 files changed, 42 insertions(+), 36 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 7544d0da31fa95e1d2440cdd291972664bbd9e39 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 27 10:57:17 2017 +0200 autocomplete off sur la répétition du mot de passe --- .../src/main/web/tag/UserProfile.tag.html | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/UserProfile.tag.html b/pollen-ui-riot-js/src/main/web/tag/UserProfile.tag.html index b347984a..bf1f75a7 100644 --- a/pollen-ui-riot-js/src/main/web/tag/UserProfile.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/UserProfile.tag.html @@ -107,7 +107,8 @@ require("./components/Avatar.tag.html"); onblur="{checkPassword}" onkeypress="{clearPasswordError}" required - maxlength="255"> + maxlength="255" + autocomplete="off"> <div if="{errors.repeatPassword}" class="c-hint--static c-hint--error"> {errors.repeatPassword} @@ -214,13 +215,12 @@ require("./components/Avatar.tag.html"); this.submitIdentity = e => { e.preventDefault(); e.stopPropagation(); - let previousName = this.user.name; this.user.name = this.refs.name.value; userService.saveUser(this.user).then(() => { this.session.updateUser(); this.bus.trigger("message", new Message(this._l("updatedIdentity"), "success")); - }).catch((e) => { - this.errors.name = e.name; + }).catch((err) => { + this.errors.name = err.name; this.update(); }); }; @@ -263,7 +263,7 @@ require("./components/Avatar.tag.html"); } }; - this.linkProvider = (provider) => (e) => { + this.linkProvider = (provider) => () => { let redirection = encodeURIComponent(location.origin + location.pathname + "?loginProvider=" + provider + "&action=link"); this.authService.getLoginProviderUrl(provider, redirection).then(result => { @@ -271,19 +271,19 @@ require("./components/Avatar.tag.html"); }); }; - this.unlinkProvider = (credentialId, index) => (e) => { + this.unlinkProvider = (credentialId, index) => () => { this.confirm(this.__.unlinkProviderMessage).then((confirm) => { if (!confirm) { return Promise.reject(); } return userService.unlinkProvider(credentialId); - }).then(result => { + }).then(() => { this.user.credentials.splice(index, 1); this.update(); }); }; - this.getProviderAvatar = (provider) => (e) => { + this.getProviderAvatar = (provider) => () => { let redirection = encodeURIComponent(location.origin + location.pathname + "?loginProvider=" + provider + "&action=avatar"); this.authService.getLoginProviderUrl(provider, redirection).then(result => { @@ -291,20 +291,20 @@ require("./components/Avatar.tag.html"); }); }; - this.deleteAvatar = e => { + this.deleteAvatar = () => { this.confirm(this.__.deleteAvatarMessage).then((confirm) => { if (!confirm) { return Promise.reject(); } return userService.deleteAvatar(); - }).then(result => { + }).then(() => { this.user.avatar = null; this.session.updateUser(); this.update(); }); }; - this.uploadAvatar = e => { + this.uploadAvatar = () => { userService.setUserAvatar(this.refs.avatar.files[0]).then((result) => { this.user.avatar = result.id; this.refs.avatar.value = null; @@ -334,7 +334,7 @@ require("./components/Avatar.tag.html"); } }; - this.deleteAccount = e => { + this.deleteAccount = () => { this.confirm(this.__.deleteUserMessage, null, null, 10).then((confirm) => { if (confirm) { userService.deleteUser(this.user.id).then(() => { -- 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 bd1361299dbd4a5e113274caf4a35da41cc230cb Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 27 10:58:02 2017 +0200 ajout du filtre de login sur l'url root --- pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html index ae071172..65ea4ee9 100644 --- a/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/Pollen.tag.html @@ -53,6 +53,7 @@ require("./popup/GtuChangeModal.tag.html"); <PollenHeader/> <PollenWaiter parent-id="body-content"/> <div id="body-content" class="body-content"> + <router> <route path="signup/validate"> <Authorization> @@ -70,6 +71,7 @@ require("./popup/GtuChangeModal.tag.html"); </route> <route path=""> + <FilterLoginProvider/> <Authorization connected-if-required="true"> <ContentLoader path={parent.parent.parent.homePage}/> </Authorization> -- 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 acb3f0f81969e6a8ee3387c3c9e20608719c39d8 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 27 11:00:23 2017 +0200 fixes #169 Suggest all the user's email addresses when he creates a poll --- pollen-ui-riot-js/src/main/web/tag/poll/Description.tag.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/tag/poll/Description.tag.html b/pollen-ui-riot-js/src/main/web/tag/poll/Description.tag.html index 074437f7..8d8af1ed 100644 --- a/pollen-ui-riot-js/src/main/web/tag/poll/Description.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/poll/Description.tag.html @@ -10,12 +10,12 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -77,9 +77,13 @@ class="c-field c-field--label" name="email" value="{form.model.creatorEmail}" - maxlength="255" disabled={opts.form.model.closed} - placeholder="{__.emailPlaceHolder}"/> + placeholder="{__.emailPlaceHolder}" + list="userEmailAddresses" + autocomplete="off"/> + <datalist if={session.isConnected() && session.getUser().emailAddresses.length > 0} id="userEmailAddresses"> + <option each={emailAddress in session.getUser().emailAddresses} value={emailAddress.emailAddress}> + </datalist> </div> </div> -- 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 41112819c70fb2d13ca95c66833e730e49797b64 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 27 11:00:53 2017 +0200 corrections linter --- pollen-ui-riot-js/src/main/web/js/AuthService.js | 26 +++++++++++----------- .../src/main/web/tag/FilterLoginProvider.tag.js | 2 +- .../tag/components/UserEmailAddressList.tag.html | 12 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pollen-ui-riot-js/src/main/web/js/AuthService.js b/pollen-ui-riot-js/src/main/web/js/AuthService.js index b1ab27b2..19d110ca 100644 --- a/pollen-ui-riot-js/src/main/web/js/AuthService.js +++ b/pollen-ui-riot-js/src/main/web/js/AuthService.js @@ -26,19 +26,19 @@ class AuthService extends FetchService { constructor() { super(); this.providerIcons = { - "amazon": "amazon", - "facebook": "facebook-official", - "flickr": "flickr", - "foursquare": "foursquare", - "github": "github", - "googleplus": "google", - "instagram": "instagram", - "linkedin": "linkedin", - "linkedin2": "linkedin", - "stackexchange": "stack-exchange", - "twitter": "twitter", - "yahoo": "yahoo" - }; + amazon: "amazon", + facebook: "facebook-official", + flickr: "flickr", + foursquare: "foursquare", + github: "github", + googleplus: "google", + instagram: "instagram", + linkedin: "linkedin", + linkedin2: "linkedin", + stackexchange: "stack-exchange", + twitter: "twitter", + yahoo: "yahoo" + }; } signIn(login, password) { diff --git a/pollen-ui-riot-js/src/main/web/tag/FilterLoginProvider.tag.js b/pollen-ui-riot-js/src/main/web/tag/FilterLoginProvider.tag.js index c2961265..4b1f0dcc 100644 --- a/pollen-ui-riot-js/src/main/web/tag/FilterLoginProvider.tag.js +++ b/pollen-ui-riot-js/src/main/web/tag/FilterLoginProvider.tag.js @@ -1,5 +1,5 @@ let riot = require("riot"); -let route = require("riot-route/lib/tag").default; // a voir pourquoi le default doit être mi ; +let route = require("riot-route/lib/tag").default; // a voir pourquoi le default doit être mis ; let session = require("../js/Session"); let userService = require("../js/UserService"); diff --git a/pollen-ui-riot-js/src/main/web/tag/components/UserEmailAddressList.tag.html b/pollen-ui-riot-js/src/main/web/tag/components/UserEmailAddressList.tag.html index f49ea357..cd57e322 100644 --- a/pollen-ui-riot-js/src/main/web/tag/components/UserEmailAddressList.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/components/UserEmailAddressList.tag.html @@ -79,8 +79,8 @@ if (!confirm) { return Promise.reject(); } - return userService.deleteEmailAddress(emailAddressId, this.opts.admin ? this.opts.user.id : null) - }).then(result => { + return userService.deleteEmailAddress(emailAddressId, this.opts.admin ? this.opts.user.id : null); + }).then(() => { this.opts.user.emailAddresses.splice(index, 1); this.update(); }); @@ -93,14 +93,14 @@ }); }; - this.submitEmailAddress = e => { + this.submitEmailAddress = () => { let emailAddress = this.refs.newEmailAddress.value; userService.addEmailAddressToUser(emailAddress, this.opts.admin ? this.opts.user.id : null).then((result) => { this.opts.user.emailAddresses.push({id: result.id, emailAddress: emailAddress, validated: false}); this.refs.newEmailAddress.value = null; this.update(); - }).catch((e) => { - this.errors.email = e.email; + }).catch((err) => { + this.errors.email = err.email; this.update(); }); }; @@ -136,4 +136,4 @@ } </style> -</UserEmailAddressList> \ No newline at end of file +</UserEmailAddressList> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm