Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 a87cc90b8 -> 700eca7a6
IGNITE-843: Filter deleted metadatas. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/700eca7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/700eca7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/700eca7a Branch: refs/heads/ignite-843 Commit: 700eca7a668d0edd8aa9ee374fd11b1e7d2abecd Parents: a87cc90 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Aug 19 18:17:02 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Aug 19 18:17:02 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/700eca7a/modules/control-center-web/src/main/js/controllers/caches-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index 121eed0..978e263 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -186,6 +186,18 @@ controlCenterModule.controller('cachesController', [ var restoredItem = angular.fromJson(sessionStorage.cacheBackupItem); if (restoredItem) { + restoredItem.queryMetadata = _.filter(restoredItem.queryMetadata, function (metaId) { + return _.findIndex($scope.metadatas, function (scopeMeta) { + return scopeMeta.value == metaId; + }) >= 0; + }); + + restoredItem.storeMetadata = _.filter(restoredItem.storeMetadata, function (metaId) { + return _.findIndex($scope.metadatas, function (scopeMeta) { + return scopeMeta.value == metaId; + }) >= 0; + }); + if (restoredItem._id) { var idx = _.findIndex($scope.caches, function (cache) { return cache._id == restoredItem._id; @@ -207,8 +219,8 @@ controlCenterModule.controller('cachesController', [ else { // Clusters changed by user. We need to remove deleted clusters (if any). restoredItem.clusters = _.filter(restoredItem.clusters, function (clusterId) { - return _.findIndex($scope.clusters, function (scopeCcluster) { - return scopeCcluster.value == clusterId; + return _.findIndex($scope.clusters, function (scopeCluster) { + return scopeCluster.value == clusterId; }) >= 0; }); }
