ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-1767 Added check for empty schemas.
Date Mon, 02 Nov 2015 09:18:28 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 f3254009f -> 7e2a94436


IGNITE-1767 Added check for empty schemas.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e2a9443
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e2a9443
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e2a9443

Branch: refs/heads/ignite-843-rc1
Commit: 7e2a944361a3443542e09cd00e04c096c208c484
Parents: f325400
Author: vsisko <vsisko@gridgain.com>
Authored: Mon Nov 2 16:18:37 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Mon Nov 2 16:18:37 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/metadata-controller.js           | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7e2a9443/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 dc340e1..5f559e2 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
@@ -324,6 +324,9 @@ consoleModule.controller('metadataController', [
                     .success(function (schemas) {
                         $scope.loadMeta.schemas = _.map(schemas, function (schema) { return
{use: false, name: schema}});
                         $scope.loadMeta.action = 'schemas';
+
+                        if ($scope.loadMeta.schemas.length == 0)
+                            $scope.loadMetadataNext();
                     })
                     .error(function (errMsg) {
                         $common.showError(errMsg);
@@ -628,14 +631,15 @@ consoleModule.controller('metadataController', [
             };
 
             $scope.loadMetadataPrev = function () {
-                if  ($scope.loadMeta.action == 'tables') {
+                if  ($scope.loadMeta.action == 'tables' && $scope.loadMeta.schemas.length
> 0) {
                     $scope.loadMeta.action = 'schemas';
                     $scope.loadMeta.button = 'Next';
                     $scope.loadMeta.info = INFO_SELECT_SCHEMAS;
                     $scope.loadMeta.loadingOptions = LOADING_TABLES;
                 }
-                else if  ($scope.loadMeta.action == 'schemas') {
+                else {
                     $scope.loadMeta.action = 'connect';
+                    $scope.loadMeta.button = 'Next';
                     $scope.loadMeta.info = INFO_CONNECT_TO_DB;
                     $scope.loadMeta.loadingOptions = LOADING_SCHEMAS;
                 }


Mime
View raw message