From 7440df44bf2e89a604ffa259f1aa7355ae41df53 Mon Sep 17 00:00:00 2001 From: denz Date: Wed, 15 Apr 2015 15:19:42 +0900 Subject: [PATCH] Change the serviceTypeCode for serviceTypeName of the URL --- web/src/main/webapp/scripts/directives/agentList.js | 2 +- web/src/main/webapp/scripts/directives/serverMap.js | 8 ++++---- web/src/main/webapp/scripts/services/NavbarVo.js | 2 +- web/src/main/webapp/scripts/services/ServerMapDao.js | 4 ++-- web/src/main/webapp/views/linkInfoDetails.html | 2 +- web/src/main/webapp/views/navbar.html | 2 +- web/src/main/webapp/views/nodeInfoDetails.html | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/web/src/main/webapp/scripts/directives/agentList.js b/web/src/main/webapp/scripts/directives/agentList.js index d5cf8313f..0cf87efc7 100644 --- a/web/src/main/webapp/scripts/directives/agentList.js +++ b/web/src/main/webapp/scripts/directives/agentList.js @@ -87,7 +87,7 @@ pinpointApp.directive('agentList', [ 'agentListConfig', '$rootScope', function ( */ scope.$on('agentList.initialize', function (event, navbarVo) { oNavbarVo = navbarVo; - showAgentGroup(oNavbarVo.getApplicationName(), oNavbarVo.getServiceTypeCode(), oNavbarVo.getQueryStartTime(), oNavbarVo.getQueryEndTime(), oNavbarVo.getAgentId()); + showAgentGroup(oNavbarVo.getApplicationName(), oNavbarVo.getServiceTypeName(), oNavbarVo.getQueryStartTime(), oNavbarVo.getQueryEndTime(), oNavbarVo.getAgentId()); }); } }; diff --git a/web/src/main/webapp/scripts/directives/serverMap.js b/web/src/main/webapp/scripts/directives/serverMap.js index b8fde9e15..f90043250 100644 --- a/web/src/main/webapp/scripts/directives/serverMap.js +++ b/web/src/main/webapp/scripts/directives/serverMap.js @@ -136,7 +136,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' * @param linkRouting * @param linkCurve */ - showServerMap = function (applicationName, serviceTypeCode, to, period, filterText, hintText, linkRouting, linkCurve) { + showServerMap = function (applicationName, serviceTypeName, to, period, filterText, hintText, linkRouting, linkCurve) { oProgressBar.startLoading(); oAlert.hideError(); oAlert.hideWarning(); @@ -148,7 +148,7 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' htLastQuery = { applicationName: applicationName, - serviceTypeCode: serviceTypeCode, + serviceTypeName: serviceTypeName, from: to - period, to: to, originTo: scope.oNavbarVo.getQueryEndTime(), @@ -710,14 +710,14 @@ pinpointApp.directive('serverMap', [ 'serverMapConfig', 'ServerMapDao', 'Alerts' scope.bShowServerMapStatus = true; bUseLinkContextMenu = bUseBackgroundContextMenu = true; bUseNodeContextMenu = false; - showServerMap(navbarVo.getApplicationName(), navbarVo.getServiceTypeCode(), navbarVo.getQueryEndTime(), navbarVo.getQueryPeriod(), navbarVo.getFilter(), navbarVo.getHint(), scope.linkRouting, scope.linkCurve); + showServerMap(navbarVo.getApplicationName(), navbarVo.getServiceTypeName(), navbarVo.getQueryEndTime(), navbarVo.getQueryPeriod(), navbarVo.getFilter(), navbarVo.getHint(), scope.linkRouting, scope.linkCurve); }); /** * scope event on serverMap.fetch */ scope.$on('serverMap.fetch', function (event, queryPeriod, queryEndTime) { - showServerMap(scope.oNavbarVo.getApplicationName(), scope.oNavbarVo.getServiceTypeCode(), queryEndTime, queryPeriod, scope.oNavbarVo.getFilter(), scope.oNavbarVo.getHint(), scope.linkRouting, scope.linkCurve); + showServerMap(scope.oNavbarVo.getApplicationName(), scope.oNavbarVo.getServiceTypeName(), queryEndTime, queryPeriod, scope.oNavbarVo.getFilter(), scope.oNavbarVo.getHint(), scope.linkRouting, scope.linkCurve); }); /** diff --git a/web/src/main/webapp/scripts/services/NavbarVo.js b/web/src/main/webapp/scripts/services/NavbarVo.js index 0d55233e8..9b3bcb8c5 100644 --- a/web/src/main/webapp/scripts/services/NavbarVo.js +++ b/web/src/main/webapp/scripts/services/NavbarVo.js @@ -58,7 +58,7 @@ pinpointApp.factory('NavbarVo', function () { return self._sApplication.split('@')[0]; }; - this.getServiceTypeCode = function () { + this.getServiceTypeName = function () { return self._sApplication.split('@')[1]; }; diff --git a/web/src/main/webapp/scripts/services/ServerMapDao.js b/web/src/main/webapp/scripts/services/ServerMapDao.js index eb4be760a..e40657ec4 100644 --- a/web/src/main/webapp/scripts/services/ServerMapDao.js +++ b/web/src/main/webapp/scripts/services/ServerMapDao.js @@ -28,7 +28,7 @@ pinpointApp.service('ServerMapDao', [ 'serverMapDaoConfig', function ServerMapDa dataType: 'json', data: { applicationName: query.applicationName, - serviceTypeCode: query.serviceTypeCode, + serviceTypeName: query.serviceTypeName, from: query.from, to: query.to }, @@ -53,7 +53,7 @@ pinpointApp.service('ServerMapDao', [ 'serverMapDaoConfig', function ServerMapDa this.getFilteredServerMapData = function (query, cb) { var data = { applicationName: query.applicationName, - serviceTypeCode: query.serviceTypeCode, + serviceTypeName: query.serviceTypeName, from: query.from, to: query.to, originTo: query.originTo, diff --git a/web/src/main/webapp/views/linkInfoDetails.html b/web/src/main/webapp/views/linkInfoDetails.html index 510a4df3c..096859bf1 100644 --- a/web/src/main/webapp/views/linkInfoDetails.html +++ b/web/src/main/webapp/views/linkInfoDetails.html @@ -82,7 +82,7 @@
  • {{name}} - Inspector + Inspector