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:58 UTC
[41/50] ignite git commit: IGNITE-843 Minor fix.
IGNITE-843 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/877a1fcd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/877a1fcd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/877a1fcd
Branch: refs/heads/ignite-843-rc3
Commit: 877a1fcd94d302fb46b55880bad8685152f28e1e
Parents: 62fc8e7
Author: Andrey <an...@gridgain.com>
Authored: Tue Feb 16 17:03:52 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Feb 16 17:03:52 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/serve/mail.js | 2 +-
.../control-center-web/src/main/js/serve/routes/admin.js | 6 +++---
.../src/main/js/serve/routes/profile.js | 4 ++--
.../control-center-web/src/main/js/serve/routes/public.js | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/877a1fcd/modules/control-center-web/src/main/js/serve/mail.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/mail.js b/modules/control-center-web/src/main/js/serve/mail.js
index 817c5d1..05d0fe9 100644
--- a/modules/control-center-web/src/main/js/serve/mail.js
+++ b/modules/control-center-web/src/main/js/serve/mail.js
@@ -45,7 +45,7 @@ module.exports.factory = function(nodemailer, settings) {
};
if (transporter.service === '' || transporter.auth.user === '' || transporter.auth.pass === '')
- return Promise.reject('Can\'t send e-mail because not configured SMTP server. Please ask webmaster to setup SMTP server!');
+ return Promise.reject('Can\'t send email because not configured SMTP server. Please ask webmaster to setup SMTP server!');
const mailer = nodemailer.createTransport(transporter);
http://git-wip-us.apache.org/repos/asf/ignite/blob/877a1fcd/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 87f8bed..9b8cbee 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
@@ -54,7 +54,7 @@ module.exports.factory = function(_, express, nodemailer, settings, mail, mongo)
mongo.Cache.remove({space: {$in: spacesIds}}).exec(),
mongo.DomainModel.remove({space: {$in: spacesIds}}).exec(),
mongo.Notebook.remove({space: {$in: spacesIds}}).exec(),
- mongo.Space.remove({owner: {$in: spacesIds}}).exec()
+ mongo.Space.remove({owner: userId}).exec()
]);
})
.catch((err) => {
@@ -65,8 +65,8 @@ 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}" 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!')
+ `You are receiving this email because your account for ${settings.smtp.username} was removed.`,
+ 'Account was removed, but failed to send email notification to user!')
)
.catch((err) => mongo.handleError(res, err));
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/877a1fcd/modules/control-center-web/src/main/js/serve/routes/profile.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/profile.js b/modules/control-center-web/src/main/js/serve/routes/profile.js
index 6b166fd..da6b599 100644
--- a/modules/control-center-web/src/main/js/serve/routes/profile.js
+++ b/modules/control-center-web/src/main/js/serve/routes/profile.js
@@ -61,10 +61,10 @@ module.exports.factory = function(_, express, mongo) {
mongo.Account.findOne({email: params.email}, (err, _user) => {
// TODO send error to admin
if (err)
- reject(new Error('Failed to check e-mail!'));
+ reject(new Error('Failed to check email!'));
if (_user && _user._id !== user._id)
- reject(new Error('User with this e-mail already registered!'));
+ reject(new Error('User with this email already registered!'));
resolve(user);
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/877a1fcd/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 4195a41..02986a8 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
@@ -105,7 +105,7 @@ module.exports.factory = function(express, passport, nodemailer, settings, mail,
account.save()
.then(() => mail.send(account, `Thanks for signing up for ${settings.smtp.username}.`,
`Hello ${account.username}!<br><br>` +
- `You are receiving this e-mail because you have signed up to use <a href="http://${req.headers.host}">${settings.smtp.username}</a>.<br><br>` +
+ `You are receiving this email because you have signed up to use <a href="http://${req.headers.host}">${settings.smtp.username}</a>.<br><br>` +
'If you have not done the sign up and do not know what this email is about, please ignore it.<br>' +
'You may reset the password by clicking on the following link, or paste this into your browser:<br><br>' +
`http://${req.headers.host}/password/reset?token=${account.resetPasswordToken}`));
@@ -163,9 +163,9 @@ module.exports.factory = function(express, passport, nodemailer, settings, mail,
'Please click on the following link, or paste this into your browser to complete the process:<br><br>' +
'http://' + req.headers.host + '/password/reset?token=' + user.resetPasswordToken + '<br><br>' +
'If you did not request this, please ignore this email and your password will remain unchanged.',
- 'Failed to send e-mail with reset link!')
+ 'Failed to send email with reset link!')
)
- .then(() => res.status(200).send('An e-mail has been sent with further instructions.'))
+ .then(() => res.status(200).send('An email has been sent with further instructions.'))
.catch((errMsg) => {
// TODO IGNITE-843 Send email to admin
return res.status(401).send(errMsg);
@@ -180,7 +180,7 @@ module.exports.factory = function(express, passport, nodemailer, settings, mail,
.then((user) => {
return new Promise((resolve, reject) => {
if (!user)
- return reject('Failed to find account with this token! Please check link from e-mail.');
+ return reject('Failed to find account with this token! Please check link from email.');
user.setPassword(req.body.password, (err, _user) => {
if (err)
@@ -196,7 +196,7 @@ module.exports.factory = function(express, passport, nodemailer, settings, mail,
return mail.send(user, 'Your password has been changed',
`Hello ${user.username}!<br><br>` +
`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!');
+ 'Password was changed, but failed to send confirmation email!');
})
.then((user) => res.status(200).send(user.email))
.catch((errMsg) => {