Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 e43d52438 -> 889b60f94
IGNITE-1485 Fixed "Select all" checkbox logic. Added timeout for agent check. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/889b60f9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/889b60f9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/889b60f9 Branch: refs/heads/ignite-843-rc1 Commit: 889b60f94e6424d50d38910065734f4fd5f9d850 Parents: e43d524 Author: vsisko <[email protected]> Authored: Wed Oct 14 10:15:19 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Oct 14 10:15:19 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 2 ++ .../src/main/js/controllers/metadata-controller.js | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/889b60f9/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index f3ee655..b5c81ea 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -1908,6 +1908,8 @@ consoleModule.controller('agent-download', [ if ($scope.checkConnection) $window.location = '/'; + $scope.checkConnection = false; + _agentDownloadModal.hide() }; http://git-wip-us.apache.org/repos/asf/ignite/blob/889b60f9/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 915adc6..bc642a7 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 @@ -203,7 +203,7 @@ consoleModule.controller('metadataController', [ }; $scope.selectSchema = function () { - $scope.loadMeta.allSchemasSelected = _.every($scope.loadMeta.schemas, 'use', true); + $scope.loadMeta.allSchemasSelected = _.every($scope.loadMeta.displayedSchemas, 'use', true); }; $scope.selectAllTables = function () { @@ -215,9 +215,13 @@ consoleModule.controller('metadataController', [ }; $scope.selectTable = function () { - $scope.loadMeta.allTablesSelected = _.every($scope.loadMeta.tables, 'use', true); + $scope.loadMeta.allTablesSelected = _.every($scope.loadMeta.displayedTables, 'use', true); }; + $scope.$watch('loadMeta.displayedSchemas', $scope.selectSchema); + + $scope.$watch('loadMeta.displayedTables', $scope.selectTable); + // Pre-fetch modal dialogs. var loadMetaModal = $modal({scope: $scope, templateUrl: 'metadata/metadata-load', show: false}); @@ -235,7 +239,7 @@ consoleModule.controller('metadataController', [ function getDrivers(onSuccess, onException) { // Get available JDBC drivers via agent. - $http.post('/agent/drivers') + $http.post('/agent/drivers', undefined, {timeout: 3000}) .success(function (drivers) { onSuccess();
