Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 f1a6e31d0 -> b4d86be9a
IGNITE-843 Minor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4d86be9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4d86be9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4d86be9 Branch: refs/heads/ignite-843-rc2 Commit: b4d86be9a13af8545d34f961e263ef2c1a1541a1 Parents: f1a6e31 Author: vsisko <[email protected]> Authored: Tue Feb 16 16:12:12 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Feb 16 16:12:12 2016 +0700 ---------------------------------------------------------------------- .../control-center-web/src/main/js/controllers/common-module.js | 2 +- modules/control-center-web/src/main/js/serve/routes/admin.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b4d86be9/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 36b353d..cf51fa3 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -1095,7 +1095,7 @@ consoleModule.service('$common', [ cacheStoreFactory: { kind: 'CacheJdbcPojoStoreFactory', CacheJdbcPojoStoreFactory: { - dataSourceBean: cache.name + 'DS', + dataSourceBean: 'ds' + cache.name, dialect: 'Generic' } }, http://git-wip-us.apache.org/repos/asf/ignite/blob/b4d86be9/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 90021ae..c41a2f0 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.`, + `You are receiving this e-mail because "${req.user.username}" remove 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));
