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/16 11:46:05 UTC
ignite git commit: IGNITE-843 Disable save button for profile screen.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 6ebf43a39 -> e656a737f
IGNITE-843 Disable save button for profile screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e656a737
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e656a737
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e656a737
Branch: refs/heads/ignite-843
Commit: e656a737f1960173e56bdde00d2c5a244f487565
Parents: 6ebf43a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Sep 16 16:45:57 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Sep 16 16:45:57 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/profile-controller.js | 19 +++++++++++++++++++
.../src/main/js/views/settings/profile.jade | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e656a737/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 7fad49e..65f141c 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
@@ -26,6 +26,25 @@ controlCenterModule.controller('profileController', ['$scope', '$http', '$common
$scope.profileUser.token = $commonUtils.randomString(20);
};
+ $scope.profileChanged = function () {
+ var old = $scope.user;
+ var cur = $scope.profileUser;
+
+ return old.username != cur.username || old.email != cur.email || old.token != cur.token ||
+ (cur.changePassword && !$common.isEmptyString(cur.newPassword));
+ };
+
+ $scope.profileCouldBeSaved = function () {
+ return $scope.profileForm.$valid && $scope.profileChanged();
+ };
+
+ $scope.saveBtnTipText = function () {
+ if (!$scope.profileForm.$valid)
+ return 'Invalid profile settings';
+
+ return $scope.profileChanged() ? 'Save profile' : 'Nothing to save';
+ };
+
$scope.saveUser = function () {
var profile = $scope.profileUser;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e656a737/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 c206fdc..c8509c4 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
@@ -58,5 +58,5 @@ block container
.col-xs-5.col-sm-4
input.form-control(type='password' ng-model='profileUser.confirmPassword' match='profileUser.newPassword' placeholder='Confirm new password' ng-required='profileUser.changePassword')
.col-xs-12.col-sm-12.details-row
- button.btn.btn-primary(ng-disabled='profileForm.$invalid' ng-click='saveUser()') Save
+ a.btn.btn-primary(ng-disabled='!profileCouldBeSaved()' ng-click='profileCouldBeSaved() && saveUser()' bs-tooltip='' data-title='{{saveBtnTipText()}}' data-placement='bottom' data-trigger='hover') Save