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/01/28 10:19:10 UTC
ignite git commit: IGNITE-843 Fixed bug with remove all clusters.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 afa2a134c -> 9ea0dbead
IGNITE-843 Fixed bug with remove all clusters.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9ea0dbea
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9ea0dbea
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9ea0dbea
Branch: refs/heads/ignite-843-rc2
Commit: 9ea0dbead6516ce0e9dc599beae67f6e60ccc4ba
Parents: afa2a13
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Jan 28 16:19:08 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Jan 28 16:19:08 2016 +0700
----------------------------------------------------------------------
.../main/js/controllers/clusters-controller.js | 62 ++++++++++----------
.../main/js/helpers/generator/generator-java.js | 2 +-
.../main/js/helpers/generator/generator-xml.js | 2 +-
3 files changed, 34 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9ea0dbea/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 fb14309..6e4c2a6 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
@@ -591,47 +591,49 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
var d = item.discovery;
- if (!$common.isEmptyString(d.addressResolver) && !$common.isValidJavaClass('Address resolver', d.addressResolver, false, 'discoAddressResolver', false, $scope.panels, 'discovery'))
- return false;
+ if (d) {
+ if (!$common.isEmptyString(d.addressResolver) && !$common.isValidJavaClass('Address resolver', d.addressResolver, false, 'discoAddressResolver', false, $scope.panels, 'discovery'))
+ return false;
- if (!$common.isEmptyString(d.listener) && !$common.isValidJavaClass('Discovery listener', d.listener, false, 'discoListener', false, $scope.panels, 'discovery'))
- return false;
+ if (!$common.isEmptyString(d.listener) && !$common.isValidJavaClass('Discovery listener', d.listener, false, 'discoListener', false, $scope.panels, 'discovery'))
+ return false;
- if (!$common.isEmptyString(d.dataExchange) && !$common.isValidJavaClass('Data exchange', d.dataExchange, false, 'dataExchange', false, $scope.panels, 'discovery'))
- return false;
+ if (!$common.isEmptyString(d.dataExchange) && !$common.isValidJavaClass('Data exchange', d.dataExchange, false, 'dataExchange', false, $scope.panels, 'discovery'))
+ return false;
- if (!$common.isEmptyString(d.metricsProvider) && !$common.isValidJavaClass('Metrics provider', d.metricsProvider, false, 'metricsProvider', false, $scope.panels, 'discovery'))
- return false;
+ if (!$common.isEmptyString(d.metricsProvider) && !$common.isValidJavaClass('Metrics provider', d.metricsProvider, false, 'metricsProvider', false, $scope.panels, 'discovery'))
+ return false;
- if (!$common.isEmptyString(d.authenticator) && !$common.isValidJavaClass('Node authenticator', d.authenticator, false, 'authenticator', false, $scope.panels, 'discovery'))
- return false;
+ if (!$common.isEmptyString(d.authenticator) && !$common.isValidJavaClass('Node authenticator', d.authenticator, false, 'authenticator', false, $scope.panels, 'discovery'))
+ return false;
- if (item.discovery.kind === 'Vm' && item.discovery.Vm.addresses.length === 0)
- return showPopoverMessage($scope.panels, 'general', 'addresses', 'Addresses are not specified');
+ if (d.kind === 'Vm' && d.Vm.addresses.length === 0)
+ return showPopoverMessage($scope.panels, 'general', 'addresses', 'Addresses are not specified');
- if (item.discovery.kind === 'S3' && $common.isEmptyString(item.discovery.S3.bucketName))
- return showPopoverMessage($scope.panels, 'general', 'bucketName', 'Bucket name should not be empty');
+ if (d.kind === 'S3' && $common.isEmptyString(d.S3.bucketName))
+ return showPopoverMessage($scope.panels, 'general', 'bucketName', 'Bucket name should not be empty');
- if (item.discovery.kind === 'Cloud') {
- if ($common.isEmptyString(item.discovery.Cloud.identity))
- return showPopoverMessage($scope.panels, 'general', 'identity', 'Identity should not be empty');
+ if (d.kind === 'Cloud') {
+ if ($common.isEmptyString(d.Cloud.identity))
+ return showPopoverMessage($scope.panels, 'general', 'identity', 'Identity should not be empty');
- if ($common.isEmptyString(item.discovery.Cloud.provider))
- return showPopoverMessage($scope.panels, 'general', 'provider', 'Provider should not be empty');
- }
+ if ($common.isEmptyString(d.Cloud.provider))
+ return showPopoverMessage($scope.panels, 'general', 'provider', 'Provider should not be empty');
+ }
- if (item.discovery.kind === 'GoogleStorage') {
- if ($common.isEmptyString(item.discovery.GoogleStorage.projectName))
- return showPopoverMessage($scope.panels, 'general', 'projectName', 'Project name should not be empty');
+ if (d.kind === 'GoogleStorage') {
+ if ($common.isEmptyString(d.GoogleStorage.projectName))
+ return showPopoverMessage($scope.panels, 'general', 'projectName', 'Project name should not be empty');
- if ($common.isEmptyString(item.discovery.GoogleStorage.bucketName))
- return showPopoverMessage($scope.panels, 'general', 'bucketName', 'Bucket name should not be empty');
+ if ($common.isEmptyString(d.GoogleStorage.bucketName))
+ return showPopoverMessage($scope.panels, 'general', 'bucketName', 'Bucket name should not be empty');
- if ($common.isEmptyString(item.discovery.GoogleStorage.serviceAccountP12FilePath))
- return showPopoverMessage($scope.panels, 'general', 'serviceAccountP12FilePath', 'Private key path should not be empty');
+ if ($common.isEmptyString(d.GoogleStorage.serviceAccountP12FilePath))
+ return showPopoverMessage($scope.panels, 'general', 'serviceAccountP12FilePath', 'Private key path should not be empty');
- if ($common.isEmptyString(item.discovery.GoogleStorage.serviceAccountId))
- return showPopoverMessage($scope.panels, 'general', 'serviceAccountId', 'Account ID should not be empty');
+ if ($common.isEmptyString(d.GoogleStorage.serviceAccountId))
+ return showPopoverMessage($scope.panels, 'general', 'serviceAccountId', 'Account ID should not be empty');
+ }
}
var swapKind = item.swapSpaceSpi && item.swapSpaceSpi.kind;
@@ -788,7 +790,7 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
$scope.clusters = [];
- $scope.selectItem(undefined, undefined);
+ $scope.backupItem = undefined;
})
.error(function (errMsg) {
$common.showError(errMsg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/9ea0dbea/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 9bce81b..e1de3c8 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -50,7 +50,7 @@ $generatorJava.toJavaCode = function (val, type) {
if (typeof(val) === 'number' || typeof(val) === 'boolean')
return '' + val;
- throw "Unknown type: " + typeof(val) + ' (' + val + ')';
+ return 'Unknown type: ' + typeof(val) + ' (' + val + ')';
};
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/9ea0dbea/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
index cbc693b..19074fa 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
@@ -352,7 +352,7 @@ $generatorXml.clusterGeneral = function (cluster, res) {
break;
default:
- throw "Unknown discovery kind: " + d.kind;
+ res.line('Unknown discovery kind: ' + d.kind);
}
res.endBlock('</property>');