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 26b1d0ecb90012339fe20b8fd7a972039689fcdf Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 18 17:49:48 2018 +0200 refs #170 : correction des emails pour le feedback --- pollen-services/src/main/resources/email/FeedbackEmail.mustache | 2 +- pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache | 2 +- pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pollen-services/src/main/resources/email/FeedbackEmail.mustache b/pollen-services/src/main/resources/email/FeedbackEmail.mustache index f0908285..178310c9 100644 --- a/pollen-services/src/main/resources/email/FeedbackEmail.mustache +++ b/pollen-services/src/main/resources/email/FeedbackEmail.mustache @@ -18,7 +18,7 @@ Platform : {{feedback.platform}} Screen resolution : {{feedback.screenResolution.width}} x {{feedback.screenResolution.height}} (L x H) window resolution : {{feedback.windowDimension.width}} x {{feedback.windowDimension.height}} (L x H) Session : {{sessionId}} -User : {{#user}}{{user.name}} ({{user.email}}){{/user}}{{^user}}Anonymous{{/user}} +User : {{#user}}{{user.name}} ({{user.defaultEmailAddress.emailAddress}}){{/user}}{{^user}}Anonymous{{/user}} Email : {{feedback.userEmail}} Locale : {{feedback.locale}} Services version : {{applicationVersion}} diff --git a/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache b/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache index 0fc2a2b5..8dfcdb80 100644 --- a/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache +++ b/pollen-services/src/main/resources/email/FeedbackEmail_fr.mustache @@ -19,7 +19,7 @@ Résolution : {{feedback.screenResolution.width}} x {{feedback.scree Taille d'affichage : {{feedback.windowDimension.width}} x {{feedback.windowDimension.height}} (L x H) Langue : {{feedback.locale}} Session : {{sessionId}} -Utilisateur : {{#user}}{{user.name}} ({{user.email}}){{/user}}{{^user}}Anonyme{{/user}} +Utilisateur : {{#user}}{{user.name}} ({{user.defaultEmailAddress.emailAddress}}){{/user}}{{^user}}Anonyme{{/user}} Email : {{feedback.userEmail}} Version services : {{applicationVersion}} {{#screenShotUrl}} diff --git a/pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html b/pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html index f82ba16a..22a54df4 100644 --- a/pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html +++ b/pollen-ui-riot-js/src/main/web/tag/popup/FeedbackModal.tag.html @@ -8,12 +8,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% @@ -109,7 +109,7 @@ require("./Modal.tag.html"); this.refs.modal.refs.category.forEach(input => {input.checked = false;}); this.refs.modal.refs.description.value = ""; this.refs.modal.refs.uploadScreenShot.checked = true; - this.refs.modal.refs.email.value = this.session.getUser().defaultEmailAddress.emailAddress; + this.refs.modal.refs.email.value = this.session.getUser() && this.session.getUser().defaultEmailAddress.emailAddress; this.refs.modal.userEmailAddresses = this.session.getUser() ? this.session.getUser().emailAddresses.map(email => email.emailAddress) : []; return this.refs.modal.open(); }; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.