From dc67cdbc7bbefa30e245aef18c56468fe85aa283 Mon Sep 17 00:00:00 2001 From: Denny Lim Date: Sat, 11 Jan 2014 02:00:08 +0000 Subject: [PATCH] =?UTF-8?q?[=EC=9E=84=EB=8C=80=ED=98=84]=20[NOBTS]=20serve?= =?UTF-8?q?rmap=20merge=20unknowns=20=EC=9E=91=EB=8F=99=20=EC=95=88?= =?UTF-8?q?=EB=90=98=EB=8D=98=20=EC=9D=B4=EC=8A=88=20=ED=95=B4=EA=B2=B0?= 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@3090 84d0f5b1-2673-498c-a247-62c4ff18d310 --- src/main/webapp/scripts/directives/serverMap.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/scripts/directives/serverMap.js b/src/main/webapp/scripts/directives/serverMap.js index 318696f6d..3684df189 100644 --- a/src/main/webapp/scripts/directives/serverMap.js +++ b/src/main/webapp/scripts/directives/serverMap.js @@ -350,7 +350,13 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' */ scope.toggleMergeUnknowns = function () { scope.mergeUnknowns = (scope.mergeUnknowns) ? false : true; - serverMapCallback(htLastQuery, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + if (scope.mergeUnknowns) { + var copiedData = angular.copy(htLastMapData); + ServerMapDao.mergeUnknown(htLastQuery, copiedData); + serverMapCallback(htLastQuery, copiedData, scope.linkRouting, scope.linkCurve); + } else { + serverMapCallback(htLastQuery, htLastMapData, scope.linkRouting, scope.linkCurve); + } reset(); }; @@ -361,7 +367,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' scope.toggleLinkLableTextType = function (type) { scope.totalRequestCount = (type !== 'tps') ? true : false; scope.tps = (type === 'tps') ? true : false; - serverMapCallback(htLastQuery, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + serverMapCallback(htLastQuery, htLastMapData, scope.linkRouting, scope.linkCurve); reset(); }; @@ -371,7 +377,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' */ scope.toggleLinkRouting = function (type) { scope.linkRouting = cfg.options.htLinkType.sRouting = type; - serverMapCallback(htLastQuery, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + serverMapCallback(htLastQuery, htLastMapData, scope.linkRouting, scope.linkCurve); reset(); }; @@ -381,7 +387,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' */ scope.toggleLinkCurve = function (type) { scope.linkCurve = cfg.options.htLinkType.sCurve = type; - serverMapCallback(htLastQuery, htLastMapData, scope.mergeUnknowns, scope.linkRouting, scope.linkCurve); + serverMapCallback(htLastQuery, htLastMapData, scope.linkRouting, scope.linkCurve); reset(); };