Repository: ignite Updated Branches: refs/heads/ignite-843 ae8035828 -> 24dcc8dda
ignite-1219 Required field. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24dcc8dd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24dcc8dd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24dcc8dd Branch: refs/heads/ignite-843 Commit: 24dcc8ddabd899ffce23ceb90705967b280b8561 Parents: ae80358 Author: Vasiliy Sisko <[email protected]> Authored: Tue Sep 29 15:04:16 2015 +0700 Committer: Andrey <[email protected]> Committed: Tue Sep 29 15:04:16 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/clusters-controller.js | 4 ++++ .../src/main/js/controllers/models/clusters.json | 1 + 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/24dcc8dd/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 a1c9537..19c9f36 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 @@ -376,6 +376,10 @@ consoleModule.controller('clustersController', [ return showPopoverMessage($scope.panels, 'general', 'serviceAccountId', 'Account ID should not be empty'); } + if (item.sslEnabled && (!$common.isDefined(item.sslContextFactory) + || $common.isEmptyString(item.sslContextFactory.keyStoreFilePath))) + return showPopoverMessage($scope.panels, 'sslConfiguration', 'keyStoreFilePath', 'Key store file should not be empty'); + if (!item.swapSpaceSpi || !item.swapSpaceSpi.kind && item.caches) { for (var i = 0; i < item.caches.length; i++) { var idx = $scope.indexOfCache(item.caches[i]); http://git-wip-us.apache.org/repos/asf/ignite/blob/24dcc8dd/modules/control-center-web/src/main/js/controllers/models/clusters.json ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json index 5e4e282..80c9f86 100644 --- a/modules/control-center-web/src/main/js/controllers/models/clusters.json +++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json @@ -756,6 +756,7 @@ "type": "text", "path": "sslContextFactory", "model": "keyStoreFilePath", + "required": true, "hide": "!backupItem.sslEnabled", "tip": [ "Path to the key store file",
