You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/16 16:14:56 UTC
[39/50] ignite git commit: IGNITE-843 Changed mail message.
IGNITE-843 Changed mail message.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3099e6b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3099e6b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3099e6b6
Branch: refs/heads/ignite-843-rc3
Commit: 3099e6b64d55b81bcadb5e48219f6d798b4b0b53
Parents: b4d86be
Author: Andrey <an...@gridgain.com>
Authored: Tue Feb 16 16:15:09 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Feb 16 16:15:09 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/serve/routes/admin.js | 2 +-
modules/control-center-web/src/main/js/serve/routes/public.js | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3099e6b6/modules/control-center-web/src/main/js/serve/routes/admin.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/admin.js b/modules/control-center-web/src/main/js/serve/routes/admin.js
index c41a2f0..87f8bed 100644
--- a/modules/control-center-web/src/main/js/serve/routes/admin.js
+++ b/modules/control-center-web/src/main/js/serve/routes/admin.js
@@ -65,7 +65,7 @@ module.exports.factory = function(_, express, nodemailer, settings, mail, mongo)
})
.then((user) => mail.send(user, 'Your account was deleted',
`Hello ${user.username}!<br><br>` +
- `You are receiving this e-mail because "${req.user.username}" remove your account on <a href="http://${req.headers.host}">${settings.smtp.username}</a>.`,
+ `You are receiving this e-mail because "${req.user.username}" removed your account on <a href="http://${req.headers.host}">${settings.smtp.username}</a>.`,
'Account was removed, but failed to send e-mail notification to user!')
)
.catch((err) => mongo.handleError(res, err));
http://git-wip-us.apache.org/repos/asf/ignite/blob/3099e6b6/modules/control-center-web/src/main/js/serve/routes/public.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/public.js b/modules/control-center-web/src/main/js/serve/routes/public.js
index 8eb1b6e..4195a41 100644
--- a/modules/control-center-web/src/main/js/serve/routes/public.js
+++ b/modules/control-center-web/src/main/js/serve/routes/public.js
@@ -195,8 +195,7 @@ module.exports.factory = function(express, passport, nodemailer, settings, mail,
.then((user) => {
return mail.send(user, 'Your password has been changed',
`Hello ${user.username}!<br><br>` +
- 'This is a confirmation that the password for your account ' + user.email + ' has just been changed.<br><br>' +
- 'Now you can login: http://' + req.headers.host,
+ `This is a confirmation that the password for your account on <a href="http://${req.headers.host}">${settings.smtp.username}</a> has just been changed.<br><br>`,
'Password was changed, but failed to send confirmation e-mail!');
})
.then((user) => res.status(200).send(user.email))