Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 341adbc28 -> 5c2784eb0
# IGNITE-843 Minor fix. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c2784eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c2784eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c2784eb Branch: refs/heads/ignite-843 Commit: 5c2784eb0146bea38dc41d707a3471c1506f726f Parents: 341adbc Author: Andrey <anovi...@gridgain.com> Authored: Tue Aug 18 16:06:06 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Aug 18 16:06:06 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/admin-controller.js | 9 ++++++--- modules/control-center-web/src/main/js/routes/admin.js | 4 ++-- .../src/main/js/views/includes/controls.jade | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c2784eb/modules/control-center-web/src/main/js/controllers/admin-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/admin-controller.js b/modules/control-center-web/src/main/js/controllers/admin-controller.js index 894ead6..c0d48c8 100644 --- a/modules/control-center-web/src/main/js/controllers/admin-controller.js +++ b/modules/control-center-web/src/main/js/controllers/admin-controller.js @@ -47,8 +47,11 @@ controlCenterModule.controller('adminController', ['$scope', '$window', '$http', $scope.users.splice(i, 1); $common.showInfo('User has been removed: "' + user.username + '"'); - }).error(function (errMsg) { - $common.showError('Failed to remove user: "' + $common.errorMessage(errMsg) + '"'); + }).error(function (errMsg, status) { + if (status == 503) + $common.showInfo(errMsg); + else + $common.showError('Failed to remove user: "' + $common.errorMessage(errMsg) + '"'); }); }); }; @@ -70,4 +73,4 @@ controlCenterModule.controller('adminController', ['$scope', '$window', '$http', user.adminChanging = false; }); } -}]); \ No newline at end of file +}]); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c2784eb/modules/control-center-web/src/main/js/routes/admin.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/admin.js b/modules/control-center-web/src/main/js/routes/admin.js index 78c835c..646b812 100644 --- a/modules/control-center-web/src/main/js/routes/admin.js +++ b/modules/control-center-web/src/main/js/routes/admin.js @@ -70,14 +70,14 @@ router.post('/remove', function (req, res) { from: transporter.auth.user, to: user.email, subject: 'Your account was deleted', - text: 'You are receiving this e-mail because admin removed your account.\n\n' + + text: 'You are receiving this e-mail because admin remove your account.\n\n' + '--------------\n' + 'Apache Ignite Web Control Center http://' + req.headers.host + '\n' }; mailer.sendMail(mailOptions, function(err){ if (err) - return res.status(500).send('Failed to send e-mail notification to user!<br />' + err); + return res.status(503).send('Account was removed, but failed to send e-mail notification to user!<br />' + err); res.sendStatus(200); }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c2784eb/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index 5c6adb5..b9c753f 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -244,7 +244,7 @@ mixin table-group-item-edit(prefix, index) .col-xs-3.col-sm-3.col-md-3 +btn-save(btnVisible, btnSave) .input-tip - button.form-control(id=direction ng-model=directionModel ng-options='item.value as item.label for item in {{sortDirections}}' on-enter=btnVisibleAndSave on-escape='tableReset()' tabindex='0') + button.form-control(id=direction ng-model=directionModel bs-select bs-options='item.value as item.label for item in {{sortDirections}}' on-enter=btnVisibleAndSave on-escape='tableReset()' tabindex='0') mixin form-row(dataSource) +form-row-custom(['col-xs-3 col-sm-2 col-md-2'], ['col-xs-6 col-sm-5 col-md-5'], dataSource)
