IGNITE-843 Fixed caches or templates list population.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/125f5661 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/125f5661 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/125f5661 Branch: refs/heads/ignite-843-rc3 Commit: 125f56617a8555c1e80fe02467c69ba5deb8b22f Parents: 0a875a7 Author: vsisko <[email protected]> Authored: Tue Feb 9 16:24:00 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Feb 9 16:24:00 2016 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/domains-controller.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/125f5661/modules/control-center-web/src/main/js/controllers/domains-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js index 066bca9..36dc602 100644 --- a/modules/control-center-web/src/main/js/controllers/domains-controller.js +++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js @@ -623,6 +623,10 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout $http.post('/api/v1/agent/tables', preset) .success(function (tables) { + _importCachesOrTemplates = [DFLT_PARTITIONED_CACHE, DFLT_REPLICATED_CACHE].concat($scope.caches); + + _fillCommonCachesOrTemplates($scope.importCommon)($scope.importCommon.action); + _.forEach(tables, function (tbl, idx) { tbl.id = idx; tbl.action = IMPORT_DM_NEW_CACHE; @@ -1094,7 +1098,7 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout $scope.importCommon = {}; - function _fillCommonCachesOrTemplates(item) { + function _fillCommonCachesOrTemplates(item) { return function (action) { if (item.cachesOrTemplates) item.cachesOrTemplates.length = 0; @@ -1132,8 +1136,6 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout $scope.caches = _mapCaches(data.caches); $scope.domains = data.domains; - _importCachesOrTemplates = [DFLT_PARTITIONED_CACHE, DFLT_REPLICATED_CACHE].concat($scope.caches); - _.forEach($scope.clusters, function (cluster) { $scope.ui.generatedCachesClusters.push(cluster.value); });
