ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-2520 Try to fix.
Date Tue, 09 Feb 2016 06:11:19 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 d7bf9e1f5 -> d43908b3e


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-rc2
Commit: d43908b3e6b3caf3338621cac52851a07cebfb74
Parents: d7bf9e1
Author: Andrey <anovikov@gridgain.com>
Authored: Tue Feb 9 13:11:12 2016 +0700
Committer: Andrey <anovikov@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 () {


Mime
View raw message