ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [14/50] ignite git commit: IGNITE-843 Fixed ssl key store required field and fixed issue with last removed cluster.
Date Wed, 03 Feb 2016 10:56:39 GMT
IGNITE-843 Fixed ssl key store required field and fixed issue with last removed cluster.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/526241af
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/526241af
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/526241af

Branch: refs/heads/ignite-843-rc3
Commit: 526241af1ff81f7c3953c04a8e3fc1f67a0e8318
Parents: ff4d8f8
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Mon Feb 1 14:45:23 2016 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Mon Feb 1 14:45:23 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/app/modules/states/configuration/clusters/ssl.jade | 2 +-
 .../src/main/js/controllers/clusters-controller.js                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/526241af/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
index 00b23f6..3d2e6b9 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
@@ -76,7 +76,7 @@ form.panel.panel-default(name='#{form}' novalidate)
                             data-name='keyStoreFilePath'
                             data-ng-model='#{model}.keyStoreFilePath'
                             data-placeholder='Path to the key store file'
-                            data-ng-required='true'
+                            data-ng-required='#{enabled}'
                             data-ng-disabled='!#{enabled}'
                         )
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/526241af/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 63b5433..69586f1 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -593,7 +593,7 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                                     if (clusters.length > 0)
                                         $scope.selectItem(clusters[0]);
                                     else
-                                        $scope.selectItem(undefined, undefined);
+                                        $scope.backupItem = undefined;
                                 }
                             })
                             .error(function (errMsg) {


Mime
View raw message