1 files changed, 14 insertions, 25 deletions

diff --git a/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js
index e42c67b..68344cd 100644..100755
--- a/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js
+++ b/src/main/resources/webapp/apps/jenkinsApp/jenkinsApp.js
@@ -3,55 +3,44 @@
 var jenkinsApp = angular.module('jenkinsApp', ['jenkinsServer', 'jenkinsJob', 'jenkinsBuild', 'core.directives', 'pagingTableService']).config(function ($routeProvider) {
   $routeProvider.
       when('/', {controller: ServerListCtrl, templateUrl: '/apps/jenkinsApp/server-list.html?noCache=' + noCache}).
-      when('/server/:uuid', {controller: ServerCtrl, templateUrl: '/apps/jenkinsApp/server.html?noCache=' + noCache}).
-      when('/job/:uuid', {controller: JobCtrl, templateUrl: '/apps/jenkinsApp/job.html?noCache=' + noCache}).
-      when('/build/:uuid', {controller: BuildCtrl, templateUrl: '/apps/jenkinsApp/build.html?noCache=' + noCache});
+      when('/server/:serverUuid', {controller: ServerCtrl, templateUrl: '/apps/jenkinsApp/server.html?noCache=' + noCache}).
+      when('/server/:serverUuid/job/:jobUuid', {controller: JobCtrl, templateUrl: '/apps/jenkinsApp/job.html?noCache=' + noCache}).
+      when('/server/:serverUuid/job/:jobUuid/build/:buildUuid', {controller: BuildCtrl, templateUrl: '/apps/jenkinsApp/build.html?noCache=' + noCache});
 });
 
 function ServerListCtrl($scope, $location, JenkinsServer) {
   JenkinsServer.query(function (servers) {
     $scope.servers = servers;
   });
-
-  $scope.showServers = function () { $location.path('/'); };
-  $scope.showServer = function (uuid) { $location.path('/server/' + uuid); };
 }
 
 function ServerCtrl($scope, $location, $routeParams, JenkinsServer, JenkinsJob, PagingTableService) {
-  var serverUuid = $routeParams.uuid;
+  $scope.serverUuid = $routeParams.serverUuid;
 
-  JenkinsServer.get({uuid: serverUuid}, function (server) {
+  JenkinsServer.get({uuid: $scope.serverUuid}, function (server) {
     $scope.server = server;
   });
 
-  $scope.jobs = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsJob, {server: serverUuid}));
-
-  $scope.showServers = function () { $location.path('/'); };
-  $scope.showJob = function (uuid) { $location.path('/job/' + uuid); };
+  $scope.jobs = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsJob, {server: $scope.serverUuid}));
 }
 
 function JobCtrl($scope, $location, $routeParams, JenkinsJob, JenkinsBuild, PagingTableService) {
-  var jobUuid = $routeParams.uuid;
+  $scope.serverUuid = $routeParams.serverUuid;
+  $scope.jobUuid = $routeParams.jobUuid;
 
-  JenkinsJob.get({uuid: jobUuid}, function (details) {
+  JenkinsJob.get({uuid: $scope.jobUuid}, function (details) {
     $scope.details = details;
   });
 
-  $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsBuild, {job: jobUuid}));
-
-  $scope.showServers = function () { $location.path('/'); };
-  $scope.showServer = function () { $location.path('/server/' + $scope.job.server); };
-  $scope.showBuild = function (uuid) { $location.path('/build/' + uuid); };
+  $scope.builds = PagingTableService.create($scope, PagingTableService.defaultCallback(JenkinsBuild, {job: $scope.jobUuid, orderBy: "timestamp-"}));
 }
 
 function BuildCtrl($scope, $location, $routeParams, JenkinsBuild) {
-  var buildUuid = $routeParams.uuid;
+  $scope.serverUuid = $routeParams.serverUuid;
+  $scope.jobUuid = $routeParams.jobUuid;
+  $scope.buildUuid = $routeParams.buildUuid;
 
-  JenkinsBuild.get({uuid: buildUuid}, function (details) {
+  JenkinsBuild.get({uuid: $scope.buildUuid}, function (details) {
     $scope.details = details;
   });
-
-  $scope.showServers = function () { $location.path('/'); };
-  $scope.showServer = function (uuid) { $location.path('/server/' + $scope.server.uuid); };
-  $scope.showJob = function (uuid) { $location.path('/job/' + $scope.build.job); };
 }