From 813904f035b612a9c61caba97d54f8a803f5a69c Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Tue, 22 Jan 2013 09:57:54 +0100 Subject: o Showing links to the Jenkins build on the build page. --- .../resources/webapp/apps/frontPageApp/build.html | 24 +++++++++++++++++++--- .../webapp/apps/frontPageApp/frontPageApp.js | 8 ++++---- 2 files changed, 25 insertions(+), 7 deletions(-) (limited to 'src/main/resources') diff --git a/src/main/resources/webapp/apps/frontPageApp/build.html b/src/main/resources/webapp/apps/frontPageApp/build.html index 0972758..9fa0991 100755 --- a/src/main/resources/webapp/apps/frontPageApp/build.html +++ b/src/main/resources/webapp/apps/frontPageApp/build.html @@ -12,17 +12,35 @@ Type - Jenkins + + + Loading... + + + + Jenkins + + visit build + + + Unknown server type. + + + - Duration + Timestamp {{build.build.timestamp | date:'medium'}} + + Result + {{{true: 'SUCCESS', false: 'FAILURE'}[build.build.success]}} +

Participants

- + diff --git a/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js b/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js index 1004c6f..4633892 100755 --- a/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js +++ b/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js @@ -1,6 +1,6 @@ 'use strict'; -var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'badge', 'build', 'jenkinsUser', 'pagingTableService', 'core.directives']).config(function ($routeProvider) { +var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'badge', 'build', 'jenkinsUser', 'jenkinsBuild', 'pagingTableService', 'core.directives']).config(function ($routeProvider) { $routeProvider. when('/', {controller: FrontPageCtrl, templateUrl: '/apps/frontPageApp/frontPage.html?noCache=' + noCache}). when('/badge/', {controller: BadgeListCtrl, templateUrl: '/apps/frontPageApp/badgeList.html?noCache=' + noCache}). @@ -136,10 +136,10 @@ function BuildListCtrl($scope, Build, PagingTableService) { { count: 100, watcher: watcher }); } -function BuildCtrl($scope, $routeParams, Build, PagingTableService) { +function BuildCtrl($scope, $routeParams, Build, JenkinsBuild) { var buildUuid = $routeParams.buildUuid; - Build.get({uuid: buildUuid}, function (build) { - $scope.build = build; + $scope.build = Build.get({uuid: buildUuid}, function (build) { + $scope.jenkinsBuild = JenkinsBuild.get({uuid: build.build.buildUuid}); }); } -- cgit v1.2.3