You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/11/05 10:17:14 UTC
ignite git commit: IGNITE-1485 Next lock,
do not refresh metadata dialog.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 44ac8adde -> 97885ee4d
IGNITE-1485 Next lock, do not refresh metadata dialog.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97885ee4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97885ee4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97885ee4
Branch: refs/heads/ignite-843-rc1
Commit: 97885ee4d4af6fd1544d496f0cc0174aec0832bc
Parents: 44ac8ad
Author: Andrey <an...@gridgain.com>
Authored: Thu Nov 5 16:17:07 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Nov 5 16:17:07 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 6 +----
.../main/js/controllers/metadata-controller.js | 26 ++++++++++++++------
2 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97885ee4/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 9da2543..71ed69d 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
@@ -1993,9 +1993,7 @@ consoleModule.controller('agent-download', [
* Close dialog and go by specified link.
*/
$scope.goBack = function () {
- if ($window.location == _agentDownloadModal.backLink)
- $window.location.reload();
- else
+ if (_agentDownloadModal.backLink)
$window.location = _agentDownloadModal.backLink;
_stopInterval();
@@ -2095,8 +2093,6 @@ consoleModule.controller('agent-download', [
// Stop refresh after first success.
_agentDownloadModal.awaitFirstSuccess = true;
- _agentDownloadModal.backLink = '/configuration/metadata';
-
$scope.agentDownloadBackTo = 'Metadata';
_startInterval();
http://git-wip-us.apache.org/repos/asf/ignite/blob/97885ee4/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 bce3bc1..4d16ea8 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
@@ -331,6 +331,10 @@ consoleModule.controller('metadataController', [
if ($scope.loadMeta.schemas.length == 0)
$scope.loadMetadataNext();
+ else
+ _.forEach($scope.loadMeta.schemas, function (sch) {
+ sch.use = true;
+ });
})
.error(function (errMsg) {
$common.showError(errMsg);
@@ -364,7 +368,7 @@ consoleModule.controller('metadataController', [
tbl.use = $common.isDefined(_.find(tbl.cols, function (col) {
return col.key;
}));
- })
+ });
})
.error(function (errMsg) {
$common.showError(errMsg);
@@ -613,12 +617,14 @@ consoleModule.controller('metadataController', [
}
$scope.loadMetadataNext = function () {
- if ($scope.loadMeta.action == 'connect')
- _loadSchemas();
- else if ($scope.loadMeta.action == 'schemas')
- _loadMetadata();
- else if ($scope.loadMeta.action == 'tables' && $scope.nextAvailable())
- _saveMetadata();
+ if ($scope.nextAvailable()) {
+ if ($scope.loadMeta.action == 'connect')
+ _loadSchemas();
+ else if ($scope.loadMeta.action == 'schemas')
+ _loadMetadata();
+ else if ($scope.loadMeta.action == 'tables' && $scope.nextAvailable())
+ _saveMetadata();
+ }
};
$scope.nextTooltipText = function () {
@@ -629,7 +635,11 @@ consoleModule.controller('metadataController', [
};
$scope.nextAvailable = function () {
- return $scope.loadMeta.action != 'tables' || $('#metadataTableData').find(':checked').length > 0;
+ switch ($scope.loadMeta.action) {
+ case 'tables': return $('#metadataTableData').find(':checked').length > 0;
+ case 'schemas': return $common.isEmptyArray($scope.loadMeta.schemas) || $('#metadataSchemaData').find(':checked').length > 0;
+ default: return true;
+ }
};
$scope.loadMetadataPrev = function () {