From f73c47b78fa02caad4d1aac37b01f12bafc8cf65 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Tue, 16 Dec 2014 17:30:18 +0900 Subject: [PATCH] #119_filter_wizard_bug_fix - scope:true, node, link cache disable --- .../scripts/directives/linkInfoDetails.js | 20 ++++++++++--------- .../scripts/directives/nodeInfoDetails.js | 13 ++++++------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/web/src/main/webapp/scripts/directives/linkInfoDetails.js b/web/src/main/webapp/scripts/directives/linkInfoDetails.js index 8649425b2..48397d3a7 100644 --- a/web/src/main/webapp/scripts/directives/linkInfoDetails.js +++ b/web/src/main/webapp/scripts/directives/linkInfoDetails.js @@ -12,7 +12,7 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', '$filter', ' restrict: 'EA', replace: true, templateUrl: 'views/linkInfoDetails.html', - scope: {}, + scope: true, link: function postLink(scope, element, attrs) { // define private variables @@ -413,7 +413,8 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', '$filter', ' if (link.sourceInfo.isWas && link.targetInfo.isWas) { oServerMapHintVo.setHint(link.toNode.applicationName, link.filterTargetRpcList) } - scope.$broadcast('linkInfoDetails.openFilteredMap', oServerMapFilterVo, oServerMapHintVo); + //scope.$broadcast('linkInfoDetails.openFilteredMap', oServerMapFilterVo, oServerMapHintVo); + scope.$emit('linkInfoDetails.openFilteredMap', oServerMapFilterVo, oServerMapHintVo); }; /** @@ -422,7 +423,8 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', '$filter', ' */ scope.openFilterWizard = function (index) { var link = htLastLink.unknownLinkGroup[index]; - scope.$broadcast('linkInfoDetails.openFilterWizard', link); + //scope.$broadcast('linkInfoDetails.openFilterWizard', link); + scope.$emit('linkInfoDetails.openFilterWizard', link); }; /** @@ -455,12 +457,12 @@ pinpointApp.directive('linkInfoDetails', [ 'linkInfoDetailsConfig', '$filter', ' */ scope.$on('linkInfoDetails.initialize', function (event, e, query, link, linkData, navbarVo, reloadOnly) { show(); - if (angular.equals(sLastKey, link.key) && !reloadOnly) { - if (htLastLink.targetRawData) { - renderAllChartWhichIsVisible(htLastLink); - } - return; - } + //if (angular.equals(sLastKey, link.key)) { + // //if (htLastLink.targetRawData) { + // renderAllChartWhichIsVisible(htLastLink); + // //} + // return; + //} reset(); htQuery = query; sLastKey = link.key; diff --git a/web/src/main/webapp/scripts/directives/nodeInfoDetails.js b/web/src/main/webapp/scripts/directives/nodeInfoDetails.js index 993146e10..692e4c9c2 100644 --- a/web/src/main/webapp/scripts/directives/nodeInfoDetails.js +++ b/web/src/main/webapp/scripts/directives/nodeInfoDetails.js @@ -301,12 +301,13 @@ pinpointApp */ scope.$on('nodeInfoDetails.initialize', function (event, e, query, node, mapData, navbarVo, reloadOnly) { show(); - if (angular.equals(sLastKey, node.key) && !reloadOnly) { - if (htLastNode.category === 'UNKNOWN_GROUP') { - renderAllChartWhichIsVisible(htLastNode); - } - return; - } + // DISABLE node Cache + //if (angular.equals(sLastKey, node.key) && !reloadOnly) { + // if (htLastNode.category === 'UNKNOWN_GROUP') { + // renderAllChartWhichIsVisible(htLastNode); + // } + // return; + //} reset(); htQuery = query; sLastKey = node.key;