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/09 10:26:41 UTC
[42/51] [abbrv] ignite git commit: IGNITE-2520 Try to fix.
IGNITE-2520 Try to fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d43908b3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d43908b3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d43908b3
Branch: refs/heads/ignite-843-rc3
Commit: d43908b3e6b3caf3338621cac52851a07cebfb74
Parents: d7bf9e1
Author: Andrey <an...@gridgain.com>
Authored: Tue Feb 9 13:11:12 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Feb 9 13:11:12 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/profile-controller.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d43908b3/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 1336784..e0056de 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
@@ -40,12 +40,14 @@ consoleModule.controller('profileController',
}
$scope.profileCouldBeSaved = function () {
- return $scope.profileForm.$valid && _profileChanged();
+ return _profileChanged() && $scope.profileForm && $scope.profileForm.$valid;
};
$scope.saveBtnTipText = function () {
- return _profileChanged()
- ? ($scope.profileForm.$valid ? 'Save profile' : 'Invalid profile settings') : 'Nothing to save';
+ if (!_profileChanged())
+ return 'Nothing to save';
+
+ return $scope.profileForm && $scope.profileForm.$valid ? 'Save profile' : 'Invalid profile settings';
};
$scope.saveUser = function () {