IGNITE-2612 Fixed filtration on clusters screen.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2ae3bce1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2ae3bce1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2ae3bce1 Branch: refs/heads/ignite-843-rc3 Commit: 2ae3bce11c5049c2b330ecfda785652f58e61227 Parents: f983f42 Author: Dmitriyff <[email protected]> Authored: Wed Feb 10 16:10:05 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Feb 10 16:10:05 2016 +0700 ---------------------------------------------------------------------- modules/control-center-web/src/main/js/app/index.js | 3 +++ .../src/main/js/controllers/clusters-controller.js | 2 +- .../src/main/js/views/configuration/clusters.jade | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2ae3bce1/modules/control-center-web/src/main/js/app/index.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js index 3e91ff6..30dc3ba 100644 --- a/modules/control-center-web/src/main/js/app/index.js +++ b/modules/control-center-web/src/main/js/app/index.js @@ -164,6 +164,9 @@ angular $locationProvider.html5Mode(true); }]) +.run(['$rootScope', ($root) => { + $root._ = _; +}]) .run(['$rootScope', '$state', 'Auth', 'User', ($root, $state, Auth, User) => { $root.$state = $state; http://git-wip-us.apache.org/repos/asf/ignite/blob/2ae3bce1/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 465f7aa..41df7ab 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 @@ -169,7 +169,7 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope $scope.selectItem = function (item, backup) { function selectItem() { - $scope.selectedItem = angular.copy(item); + $scope.selectedItem = item; try { if (item && item._id) http://git-wip-us.apache.org/repos/asf/ignite/blob/2ae3bce1/modules/control-center-web/src/main/js/views/configuration/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade index e5a3a07..e3556ac 100644 --- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade +++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade @@ -50,7 +50,7 @@ include ../includes/infos hr .bs-affix-fix div(bs-collapse='' data-allow-multiple='true' ng-model='ui.activePanels') - form.form-horizontal(name='ui.inputForm' ng-show='backupItem' novalidate) + form.form-horizontal(name='ui.inputForm' ng-show='backupItem && _.includes(displayedRows, selectedItem)' novalidate) .panel-group(ng-click='triggerDigest = true') ignite-configuration-clusters-general .advanced-options
