home/pinpoint
2
0
Fork 0
mirror of https://github.com/wahyd4/pinpoint.git synced 2026-08-14 07:16:47 +10:00
Code Issues Packages Projects Releases Wiki Activity

bug fix.

Browse Source 
- error when open "Inspect Agents" at transaction View.
This commit is contained in:
denz
2016-01-14 16:22:45 +09:00
parent 5c35a6677e
commit 59e02f2c46
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/main/webapp/features/agentInfo/agent-info.directive.js
+8 -5
View File
@@ -274,18 +274,21 @@
scope.currentServiceInfo = initServiceInfo(agent);
var aFromTo, period, aSelectionFromTo = [];
if ( scope.selectTime === -1 ) {
scope.selectTime = oNavbarVoService.getQueryEndTime();
if ( timeSlider === null ) {
aSelectionFromTo[0] = oNavbarVoService.getQueryStartTime();
aSelectionFromTo[1] = oNavbarVoService.getQueryEndTime();
period = oNavbarVoService.getPeriod();
} else {
aSelectionFromTo = timeSlider.getSelectionTimeSeries();
aFromTo = timeSlider.getSliderTimeSeries();
period = getPeriod(aSelectionFromTo[0], aSelectionFromTo[1]);
}
if ( scope.selectTime === -1 ) {
scope.selectTime = oNavbarVoService.getQueryEndTime();
} else {
if ( scope.selectTime !== oNavbarVoService.getQueryEndTime() ) {
loadAgentInfo( scope.selectTime );
}
aSelectionFromTo = timeSlider.getSelectionTimeSeries();
aFromTo = timeSlider.getSliderTimeSeries();
period = getPeriod( aSelectionFromTo[0], aSelectionFromTo[1] );
}
$timeout(function () {
loadChartData(agent.agentId, aSelectionFromTo, period, function() {
web/src/main/webapp/features/serverMap/server-map.directive.js
+2 -1
View File
@@ -758,7 +758,7 @@
/**
* scope event on serverMapDirective.initializeWithMapData
*/
scope.$on('serverMapDirective.initializeWithMapData', function (event, mapData) {
scope.$on('serverMapDirective.initializeWithMapData', function (event, mapData, navbarVoService) {
reset();
scope.bShowServerMapStatus = false;
bUseBackgroundContextMenu = true;
@@ -767,6 +767,7 @@
applicationName: mapData.applicationId
};
htLastMapData = mapData;
scope.oNavbarVoService = navbarVoService;
serverMapCallback(htLastQuery, ServerMapDaoService.extractDataFromApplicationMapData(htLastMapData.applicationMapData), scope.linkRouting, scope.linkCurve);
});
web/src/main/webapp/pages/transactionView/transaction-view.controller.js
+6 -4
View File
@@ -11,8 +11,8 @@
applicationUrl: '/transactionInfo.pinpoint'
});
pinpointApp.controller('TransactionViewCtrl', [ 'TransactionViewConfig', '$scope', '$rootScope', '$rootElement', 'AlertsService', 'ProgressBarService', '$timeout', '$routeParams', 'TransactionDaoService', 'AgentDaoService', 'AnalyticsService',
function (cfg, $scope, $rootScope, $rootElement, AlertsService, ProgressBarService, $timeout, $routeParams, TransactionDaoService, AgentDaoService, analyticsService) {
pinpointApp.controller('TransactionViewCtrl', [ 'TransactionViewConfig', '$scope', '$rootScope', '$rootElement', 'AlertsService', 'ProgressBarService', '$timeout', '$routeParams', 'NavbarVoService', 'TransactionDaoService', 'AgentDaoService', 'AnalyticsService', 'PreferenceService',
function (cfg, $scope, $rootScope, $rootElement, AlertsService, ProgressBarService, $timeout, $routeParams, NavbarVoService, TransactionDaoService, AgentDaoService, analyticsService, preferenceService) {
analyticsService.send(analyticsService.CONST.TRANSACTION_VIEW_PAGE);
// define private variables
var oAlertService, oProgressBarService;
@@ -28,7 +28,6 @@
};
oAlertService = new AlertsService($rootElement);
oProgressBarService = new ProgressBarService($rootElement);
/**
* initialize
*/
@@ -115,7 +114,10 @@
* show server map
*/
showServerMap = function () {
$scope.$broadcast('serverMapDirective.initializeWithMapData', $scope.transactionDetail);
var oNavbarVoService = new NavbarVoService();
oNavbarVoService.setReadablePeriod(preferenceService.getPeriodTypes()[0]);
oNavbarVoService.setQueryEndDateTime(moment(parseInt($routeParams.focusTimestamp)).format('YYYY-MM-DD-HH-mm-ss'));
$scope.$broadcast('serverMapDirective.initializeWithMapData', $scope.transactionDetail, oNavbarVoService);
};
/**