You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/07/23 10:40:38 UTC

[07/50] [abbrv] incubator-ignite git commit: IGNITE-843: Fixed case when no caches.

IGNITE-843: Fixed case when no caches.


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

Branch: refs/heads/ignite-1121
Commit: fffdbdbf7e14f783ccb2d3ee92ce41f07e832b95
Parents: 064ea50
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Jul 20 19:17:07 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Jul 20 19:17:07 2015 +0700

----------------------------------------------------------------------
 .../web-control-center/nodejs/controllers/clusters-controller.js   | 2 +-
 modules/web-control-center/nodejs/routes/generator/common.js       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fffdbdbf/modules/web-control-center/nodejs/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/clusters-controller.js b/modules/web-control-center/nodejs/controllers/clusters-controller.js
index 8a5dc45..36f783a 100644
--- a/modules/web-control-center/nodejs/controllers/clusters-controller.js
+++ b/modules/web-control-center/nodejs/controllers/clusters-controller.js
@@ -195,7 +195,7 @@ controlCenterModule.controller('clustersController', ['$scope', '$http', '$commo
 
         // Check cluster logical consistency.
         function validate(item) {
-            if (!item.swapSpaceSpi || !item.swapSpaceSpi.kind) {
+            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/incubator-ignite/blob/fffdbdbf/modules/web-control-center/nodejs/routes/generator/common.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/generator/common.js b/modules/web-control-center/nodejs/routes/generator/common.js
index ed65d6b..dcbf156 100644
--- a/modules/web-control-center/nodejs/routes/generator/common.js
+++ b/modules/web-control-center/nodejs/routes/generator/common.js
@@ -272,7 +272,6 @@ exports.generateProperties = function (cluster) {
     var datasources = [];
 
     if (cluster.caches && cluster.caches.length > 0) {
-
         _.forEach(cluster.caches, function (cache) {
             if (cache.cacheStoreFactory && cache.cacheStoreFactory.kind) {
                 var storeFactory = cache.cacheStoreFactory[cache.cacheStoreFactory.kind];