ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-843 Minor fix.
Date Wed, 20 Jan 2016 04:57:50 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 1962a2c7d -> d67727a29


IGNITE-843 Minor fix.


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

Branch: refs/heads/ignite-843-rc2
Commit: d67727a29297f52b92eccb943e3a627b9544efdd
Parents: 1962a2c
Author: Andrey <anovikov@gridgain.com>
Authored: Wed Jan 20 11:58:12 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Wed Jan 20 11:58:12 2016 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/common-module.js                 | 4 ++--
 .../src/main/js/controllers/sql-controller.js                | 8 +++-----
 .../src/main/js/public/stylesheets/style.scss                | 2 +-
 modules/control-center-web/src/main/js/routes/agent.js       | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d67727a2/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 f980c53..e160714 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
@@ -2075,9 +2075,9 @@ consoleModule.service('$agentDownload', [
                 _modal.$promise.then(_modal.show);
             }
 
-            scope.nodeFailedConnection = status === 404 || timedOut;
+            scope.nodeFailedConnection = status !== 500 || timedOut;
 
-            if (status === 500)
+            if (status !== 404)
                 $common.showError(errMsg, 'top-right', 'body', true);
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d67727a2/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index f9f682f..1826bfa 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -1468,13 +1468,11 @@ consoleModule.controller('sqlController', function ($http, $timeout,
$interval,
 
         $http.post('/api/v1/agent/cache/metadata', {demo: $scope.demo})
             .success(function (metadata) {
-                $scope.metadata = _.sortBy(metadata, _.filter(metadata, function (meta) {
-                    var cacheName = _mask(meta.cacheName);
-
-                    var cache = _.find($scope.caches, { name: cacheName });
+                $scope.metadata = _.sortBy(_.filter(metadata, function (meta) {
+                    var cache = _.find($scope.caches, { name: meta.cacheName });
 
                     if (cache) {
-                        meta.name = (cache.sqlSchema ? cache.sqlSchema : (_.isEmpty(cache.cacheName)
? '"' + cacheName + '"' : "")) + '.' + meta.typeName;
+                        meta.name = (cache.sqlSchema ? cache.sqlSchema : '"' + meta.cacheName
+ '"') + '.' + meta.typeName;
 
                         meta.displayMame = _mask(meta.cacheName) + '.' + meta.typeName;
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d67727a2/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 08c01fd..b37b1ad 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -1889,7 +1889,7 @@ treecontrol.tree-classic {
     position: absolute;
     overflow: hidden;
     top: 0;
-    z-index: 9999;
+    z-index: 1001;
     pointer-events: none;
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d67727a2/modules/control-center-web/src/main/js/routes/agent.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/agent.js b/modules/control-center-web/src/main/js/routes/agent.js
index d4e67bc..b3d94db 100644
--- a/modules/control-center-web/src/main/js/routes/agent.js
+++ b/modules/control-center-web/src/main/js/routes/agent.js
@@ -227,7 +227,7 @@ router.post('/cache/metadata', function (req, res) {
                     if (!_.isEmpty(indexes))
                         columns = columns.concat({type: 'indexes', name: 'Indexes', cacheName:
meta.cacheName, typeName: typeName, children: indexes });
 
-                    return {type: 'type', cacheName: meta.cacheName,  typeName: typeName,
children: columns };
+                    return {type: 'type', cacheName: meta.cacheName || "",  typeName: typeName,
children: columns };
                 });
 
                 if (!_.isEmpty(cacheTypes))


Mime
View raw message