diff options
author | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-17 22:56:32 +0100 |
---|---|---|
committer | Trygve Laugstøl <trygvis@inamo.no> | 2013-01-17 22:56:32 +0100 |
commit | 20f0391fc5cc5e87f96f838767bed8b4d707928d (patch) | |
tree | a96a11db8d57845ca6b5534453a5a2f9d5c6daa7 /src/main/resources/webapp/apps/frontPageApp | |
parent | 4e75fdc85ff2a9e04d1820a3a2f8dc62e431295b (diff) | |
download | esper-testing-20f0391fc5cc5e87f96f838767bed8b4d707928d.tar.gz esper-testing-20f0391fc5cc5e87f96f838767bed8b4d707928d.tar.bz2 esper-testing-20f0391fc5cc5e87f96f838767bed8b4d707928d.tar.xz esper-testing-20f0391fc5cc5e87f96f838767bed8b4d707928d.zip |
o Adding "jenkins_users" to the JSON representation of a person.
o Showing the avatar on the person page too.
Diffstat (limited to 'src/main/resources/webapp/apps/frontPageApp')
-rwxr-xr-x | src/main/resources/webapp/apps/frontPageApp/frontPageApp.js | 10 | ||||
-rwxr-xr-x | src/main/resources/webapp/apps/frontPageApp/person.html | 13 |
2 files changed, 20 insertions, 3 deletions
diff --git a/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js b/src/main/resources/webapp/apps/frontPageApp/frontPageApp.js index def1e67..fb3c22c 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', 'pagingTableService', 'core.directives']).config(function ($routeProvider) { +var frontPageApp = angular.module('frontPageApp', ['ngGrid', 'person', 'badge', 'build', 'jenkinsUser', '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}). @@ -85,7 +85,7 @@ function PersonListCtrl($scope, Person, PagingTableService) { $scope.personGroups = []; } -function PersonCtrl($scope, $routeParams, Person, Build, PagingTableService) { +function PersonCtrl($scope, $routeParams, Person, Build, JenkinsUser, PagingTableService) { var personUuid = $routeParams.personUuid; $scope.mode = 'overview'; @@ -107,6 +107,12 @@ function PersonCtrl($scope, $routeParams, Person, Build, PagingTableService) { Person.get({uuid: personUuid}, function (person) { $scope.person = person; + + $scope.jenkinsUsers = person.jenkinsUsers; + _.forEach(person.jenkinsUsers, function(uuid, i) { + JenkinsUser.get({uuid: uuid}, function(user) { + $scope.jenkinsUsers[i] = user; + })}); }); Build.query({person: personUuid}, function (builds) { diff --git a/src/main/resources/webapp/apps/frontPageApp/person.html b/src/main/resources/webapp/apps/frontPageApp/person.html index 189523c..5da1b20 100755 --- a/src/main/resources/webapp/apps/frontPageApp/person.html +++ b/src/main/resources/webapp/apps/frontPageApp/person.html @@ -3,12 +3,13 @@ <navbar/> <div class="page-header"> - <h1>{{person.person.name}}</h1> + <h1><person-avatar person="person.person"></person-avatar> {{person.person.name}}</h1> </div> <ul class="nav nav-tabs"> <li ng-class="{active: mode == 'overview'}"><a ng-click="setMode('overview')">Overview</a></li> <li ng-class="{active: mode == 'builds'}"><a ng-click="setMode('builds')">Builds</a></li> + <li ng-class="{active: mode == 'jenkins'}"><a ng-click="setMode('jenkins')">Jenkins</a></li> </ul> <div id="overview" ng-show="mode == 'overview'" class="row"> @@ -91,4 +92,14 @@ </tfoot> </table> </div> + + <div id="jenkins" ng-show="mode == 'jenkins'"> + <h3>Jenkins</h3> + <ul> + <li ng-repeat="user in jenkinsUsers"> + <span ng-hide="user.uuid != null">Loading user: <code>{{user}}</code> -{{user.uuid != null}}-</span> + <span ng-show="user.uuid != null"><a href="{{user.absoluteUrl}}">{{user.absoluteUrl}}</a></span> + </li> + </ul> + </div> </div> |