From 4b3359c8a726e52aa797cf87532af89d117e6b06 Mon Sep 17 00:00:00 2001 From: Denny Lim Date: Tue, 3 Sep 2013 02:00:55 +0000 Subject: [PATCH] =?UTF-8?q?[=EC=9E=84=EB=8C=80=ED=98=84]=20[NOBTS]=20navba?= =?UTF-8?q?r=20=EC=8B=9C=EA=B0=84=20=EC=9E=90=EB=8F=99=20=EC=85=8B?= =?UTF-8?q?=ED=8C=85,=20servermap=20=EC=BB=A8=ED=85=8D=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@2250 84d0f5b1-2673-498c-a247-62c4ff18d310 --- src/main/webapp/scripts/directives/navbar.js | 2 ++ .../scripts/directives/nodeInfoDetails.js | 4 +++- src/main/webapp/views/nodeInfoDetails.html | 7 ++++++- src/main/webapp/views/servermap.html | 18 +++++++++--------- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/main/webapp/scripts/directives/navbar.js b/src/main/webapp/scripts/directives/navbar.js index 06116055f..f318bbe24 100644 --- a/src/main/webapp/scripts/directives/navbar.js +++ b/src/main/webapp/scripts/directives/navbar.js @@ -47,6 +47,8 @@ pinpointApp.directive('navbar', [ 'navbarConfig', '$rootScope', '$http', $timeout(function () { if ($routeParams.queryEndTime) { setDateTime($routeParams.queryEndTime); + } else { + setDateTime(); } }); diff --git a/src/main/webapp/scripts/directives/nodeInfoDetails.js b/src/main/webapp/scripts/directives/nodeInfoDetails.js index d1a8645b0..ae8df0b0e 100644 --- a/src/main/webapp/scripts/directives/nodeInfoDetails.js +++ b/src/main/webapp/scripts/directives/nodeInfoDetails.js @@ -6,7 +6,7 @@ pinpointApp.constant('nodeInfoDetailsConfig', { }); pinpointApp - .directive('nodeInfoDetails', [ 'nodeInfoDetailsConfig', '$rootScope', '$templateCache', function (config, $rootScope, $templateCache) { + .directive('nodeInfoDetails', [ 'nodeInfoDetailsConfig', function (config) { return { restrict: 'EA', replace: true, @@ -14,6 +14,7 @@ pinpointApp link: function postLink(scope, element, attrs) { var reset = function () { + scope.nodeName = null; scope.nodeCategory = null; scope.unknownGroup = null; scope.hosts = null; @@ -25,6 +26,7 @@ pinpointApp }; var showDetailInformation = function (query, data) { + scope.nodeName = data.text; scope.nodeCategory = data.category; scope.unknownGroup = data.textArr; scope.hosts = data.hosts; diff --git a/src/main/webapp/views/nodeInfoDetails.html b/src/main/webapp/views/nodeInfoDetails.html index dbd7f5e3b..1c208a9e9 100644 --- a/src/main/webapp/views/nodeInfoDetails.html +++ b/src/main/webapp/views/nodeInfoDetails.html @@ -10,11 +10,16 @@
- USER +
+ USER +
+
+ {{nodeName}} +
Hosts