Merge pull request #1872 from denzelsN/master

bug fix.
pinpoint-apm · Jun 24, 2016 · d9728c7 · d9728c7
2 parents 95ce851 + 88455ff
commit d9728c7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/web/src/grunt/concat.js b/web/src/grunt/concat.js
@@ -185,7 +185,7 @@ module.exports = function( grunt, options ) {
 				'/features/serverList/server-list.directive.js',
 				'/features/agentList/agent-list.directive.js',
 				'/features/agentInfo/agent-info.directive.js',
-				'/features/time-slider/time-slider.directive.js',
+				'/features/timeSlider/time-slider.directive.js',
 				'/features/transactionTable/transaction-table.directive.js',
 				'/features/timeline/timeline.directive.js',
 				'/features/agentChartGroup/agent-chart-group.directive.js',

diff --git a/web/src/main/webapp/features/navbar/navbar.directive.js b/web/src/main/webapp/features/navbar/navbar.directive.js
@@ -273,12 +273,15 @@
 	                        return;
 	                    }
 	                    oNavbarVoService.setApplication(scope.application);
+						UrlVoService.setApplication(scope.application);
 
 						scope.callee = prevCallee = preferenceService.getCalleeByApp(scope.application);
 	                    scope.caller = prevCaller = preferenceService.getCallerByApp(scope.application);
 
 						oNavbarVoService.setCalleeRange( scope.callee );
 	                    oNavbarVoService.setCallerRange( scope.caller );
+						UrlVoService.setCallee( scope.callee );
+						UrlVoService.setCaller( scope.caller );
 
 	                    if (scope.periodType === cfg.periodType.LAST && scope.readablePeriod) {
 							oNavbarVoService.setPeriodType( cfg.periodType.LAST );

diff --git a/web/src/main/webapp/pages/transactionList/transaction-list.controller.js b/web/src/main/webapp/pages/transactionList/transaction-list.controller.js
@@ -13,8 +13,8 @@
 		TRANSACTION_LIST_RESIZER: "transactionList.resizer"
 	});
 
-	pinpointApp.controller("TransactionListCtrl", ["TransactionListConfig", "$scope", "$location", "$routeParams", "$rootScope", "$timeout", "$window", "$http", "webStorage", "TimeSliderVoService", "TransactionDaoService", "AnalyticsService", "helpContentService",
-	    function (cfg, $scope, $location, $routeParams, $rootScope, $timeout, $window, $http, webStorage, TimeSliderVoService, oTransactionDaoService, analyticsService, helpContentService) {
+	pinpointApp.controller("TransactionListCtrl", ["TransactionListConfig", "$scope", "$location", "locationService", "$routeParams", "$rootScope", "$timeout", "$window", "$http", "webStorage", "TimeSliderVoService", "TransactionDaoService", "AnalyticsService", "helpContentService",
+	    function (cfg, $scope, $location, locationService, $routeParams, $rootScope, $timeout, $window, $http, webStorage, TimeSliderVoService, oTransactionDaoService, analyticsService, helpContentService) {
 			analyticsService.send(analyticsService.CONST.TRANSACTION_LIST_PAGE);
 	        // define private variables
 	        var nFetchCount, nLastFetchedIndex, htTransactionInfo, htTransactionData, oTimeSliderVoService;
@@ -82,7 +82,7 @@
 	        }, 100);
 			alertAndMove = function( msg ) {
 				alert( msg );
-				$window.location.replace( $window.location.href.replace( "transactionList", "main" ) );
+				locationService.path( "/main/" + $routeParams.application + "/" + $routeParams.readablePeriod + "/" + $routeParams.queryEndDateTime ).replace();
 			};
 
 			initAndLoad = function(bHasTransactionInfo) {