Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 9919853d1 -> 466e9e661
IGNITE-2014 Fixed url. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/90884244 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/90884244 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/90884244 Branch: refs/heads/ignite-843-rc2 Commit: 908842445576c97ecb8511264726b5155ea2735f Parents: 5d3d1f3 Author: Andrey <[email protected]> Authored: Thu Dec 3 14:40:30 2015 +0700 Committer: Andrey <[email protected]> Committed: Thu Dec 3 14:40:30 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 7 +++++-- .../src/main/js/controllers/clusters-controller.js | 16 ++++++++++------ .../src/main/js/controllers/igfs-controller.js | 7 +++++-- .../src/main/js/controllers/metadata-controller.js | 7 +++++-- 4 files changed, 25 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/90884244/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 54351ac..8429071 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 @@ -17,8 +17,8 @@ // Controller for Caches screen. consoleModule.controller('cachesController', [ - '$scope', '$controller', '$filter', '$http', '$timeout', '$common', '$focus', '$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', - function ($scope, $controller, $filter, $http, $timeout, $common, $focus, $confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) { + '$scope', '$state', '$controller', '$filter', '$http', '$timeout', '$common', '$focus', '$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', + function ($scope, $state, $controller, $filter, $http, $timeout, $common, $focus, $confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) { $unsavedChangesGuard.install($scope); // Initialize the super class and extend it. @@ -383,6 +383,9 @@ consoleModule.controller('cachesController', [ $scope.backupItem = angular.copy(item); else $scope.backupItem = undefined; + + if ($common.getQueryVariable('new')) + $state.go('base.configuration.caches'); } $common.confirmUnsavedChanges($scope.ui.isDirty(), selectItem); http://git-wip-us.apache.org/repos/asf/ignite/blob/90884244/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 cd0dc0d..d9a24ff 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 @@ -17,8 +17,8 @@ // Controller for Clusters screen. consoleModule.controller('clustersController', [ - '$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', - function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) { + '$scope', '$state', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', + function ($scope, $state, $controller, $http, $timeout, $common, $focus, $confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) { $unsavedChangesGuard.install($scope); // Initialize the super class and extend it. @@ -341,6 +341,9 @@ consoleModule.controller('clustersController', [ $scope.backupItem = angular.copy(item); else $scope.backupItem = undefined; + + if ($common.getQueryVariable('new')) + $state.go('base.configuration.clusters'); } $common.confirmUnsavedChanges($scope.ui.isDirty(), selectItem); @@ -349,27 +352,28 @@ consoleModule.controller('clustersController', [ 'Selected cluster: ' + $scope.backupItem.name : 'New cluster'; }; - function prepareNewItem(cacheId) { + function prepareNewItem(id) { var newItem = { discovery: {kind: 'Multicast', Vm: {addresses: ['127.0.0.1:47500..47510']}, Multicast: {}}, deploymentMode: 'SHARED' }; - newItem.caches = cacheId && _.find($scope.caches, {value: cacheId}) ? [cacheId] : []; + newItem.caches = id && _.find($scope.caches, {value: id}) ? [id] : []; + newItem.igfss = id && _.find($scope.igfss, {value: id}) ? [id] : []; newItem.space = $scope.spaces[0]._id; return newItem; } // Add new cluster. - $scope.createItem = function(cacheId) { + $scope.createItem = function(id) { $table.tableReset(); $timeout(function () { $common.ensureActivePanel($scope.panels, "general", 'clusterName'); }); - $scope.selectItem(undefined, prepareNewItem(cacheId)); + $scope.selectItem(undefined, prepareNewItem(id)); }; $scope.indexOfCache = function (cacheId) { http://git-wip-us.apache.org/repos/asf/ignite/blob/90884244/modules/control-center-web/src/main/js/controllers/igfs-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js index 872396d..e2960de 100644 --- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js +++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js @@ -17,8 +17,8 @@ // Controller for IGFS screen. consoleModule.controller('igfsController', [ - '$scope', '$controller', '$filter', '$http', '$timeout', '$common', '$focus', '$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', - function ($scope, $controller, $filter, $http, $timeout, $common, $focus, $confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) { + '$scope', '$state', '$controller', '$filter', '$http', '$timeout', '$common', '$focus', '$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', + function ($scope, $state, $controller, $filter, $http, $timeout, $common, $focus, $confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) { $unsavedChangesGuard.install($scope); // Initialize the super class and extend it. @@ -228,6 +228,9 @@ consoleModule.controller('igfsController', [ $scope.backupItem = angular.copy(item); else $scope.backupItem = undefined; + + if ($common.getQueryVariable('new')) + $state.go('base.configuration.igfs'); } $common.confirmUnsavedChanges($scope.ui.isDirty(), selectItem); http://git-wip-us.apache.org/repos/asf/ignite/blob/90884244/modules/control-center-web/src/main/js/controllers/metadata-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index 6a3e99e..35270d7 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -17,8 +17,8 @@ // Controller for Metadata screen. consoleModule.controller('metadataController', [ - '$scope', '$controller', '$filter', '$http', '$modal', '$common', '$timeout', '$focus', '$confirm', '$confirmBatch', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', - function ($scope, $controller, $filter, $http, $modal, $common, $timeout, $focus, $confirm, $confirmBatch, $clone, $table, $preview, $loading, $unsavedChangesGuard) { + '$scope', '$state', '$controller', '$filter', '$http', '$modal', '$common', '$timeout', '$focus', '$confirm', '$confirmBatch', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard', + function ($scope, $state, $controller, $filter, $http, $modal, $common, $timeout, $focus, $confirm, $confirmBatch, $clone, $table, $preview, $loading, $unsavedChangesGuard) { $unsavedChangesGuard.install($scope); // Initialize the super class and extend it. @@ -782,6 +782,9 @@ consoleModule.controller('metadataController', [ $scope.backupItem = angular.copy(item); else $scope.backupItem = undefined; + + if ($common.getQueryVariable('new')) + $state.go('base.configuration.metadata'); } $common.confirmUnsavedChanges($scope.ui.isDirty(), selectItem);
