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 2015/09/17 12:13:21 UTC
ignite git commit: IGNITE-843 Fixed profile change password.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 1fe56e2ab -> 2e70d5a44
IGNITE-843 Fixed profile change password.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2e70d5a4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2e70d5a4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2e70d5a4
Branch: refs/heads/ignite-843
Commit: 2e70d5a44c63c468a2e148de53a9f088d033fc3f
Parents: 1fe56e2
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Sep 17 17:13:16 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Sep 17 17:13:16 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/profile-controller.js | 7 ++++++-
modules/control-center-web/src/main/js/routes/profile.js | 5 +++--
.../src/main/js/views/settings/profile.jade | 4 ++--
3 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e70d5a4/modules/control-center-web/src/main/js/controllers/profile-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/profile-controller.js b/modules/control-center-web/src/main/js/controllers/profile-controller.js
index 65f141c..6dee868 100644
--- a/modules/control-center-web/src/main/js/controllers/profile-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/profile-controller.js
@@ -16,7 +16,7 @@
*/
// Controller for Profile screen.
-controlCenterModule.controller('profileController', ['$scope', '$http', '$common', function ($scope, $http, $common) {
+controlCenterModule.controller('profileController', ['$scope', '$http', '$common', '$focus', function ($scope, $http, $common, $focus) {
$scope.profileUser = angular.copy($scope.user);
if ($scope.profileUser && !$scope.profileUser.token)
@@ -68,11 +68,16 @@ controlCenterModule.controller('profileController', ['$scope', '$http', '$common
}).success(function (user) {
$common.showInfo('Profile saved.');
+ profile.newPassword = null;
+ profile.confirmPassword = null;
+
if (changeUsername)
$scope.user.username = userName;
if (changeEmail)
$scope.user.email = email;
+
+ $focus('profile-username');
}).error(function (err) {
$common.showError('Failed to save profile: ' + $common.errorMessage(err));
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e70d5a4/modules/control-center-web/src/main/js/routes/profile.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/profile.js b/modules/control-center-web/src/main/js/routes/profile.js
index 9101742..cd3fd5b 100644
--- a/modules/control-center-web/src/main/js/routes/profile.js
+++ b/modules/control-center-web/src/main/js/routes/profile.js
@@ -42,8 +42,7 @@ function _updateUser(res, user, params) {
if (params.token)
user.token = params.token;
-
- if (params.userName || params.email || params.token)
+ if (params.userName || params.email || params.token || params.newPassword)
user.save(function (err) {
if (err)
// TODO IGNITE-843 Send error to admin.
@@ -51,6 +50,8 @@ function _updateUser(res, user, params) {
res.json(user);
});
+ else
+ res.status(200);
}
function _checkUserEmailAndUpdate(res, user, params) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/2e70d5a4/modules/control-center-web/src/main/js/views/settings/profile.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/settings/profile.jade b/modules/control-center-web/src/main/js/views/settings/profile.jade
index c8509c4..811a107 100644
--- a/modules/control-center-web/src/main/js/views/settings/profile.jade
+++ b/modules/control-center-web/src/main/js/views/settings/profile.jade
@@ -34,11 +34,11 @@ block container
.details-row
+lbl('User name:')
.col-xs-5.col-sm-4
- input.form-control(type='text' ng-model='profileUser.username' placeholder='Input name' required)
+ input.form-control(id='profile-username' type='text' ng-model='profileUser.username' placeholder='Input name' required auto-focus)
.details-row
+lbl('Email:')
.col-xs-5.col-sm-4
- input.form-control(type='email' ng-model='profileUser.email' placeholder='you@domain.com' required)
+ input.form-control(id='profile-email' type='email' ng-model='profileUser.email' placeholder='you@domain.com' required)
.details-row
+lbl('Security token:')
label {{profileUser.token}}