Merge pull request #4657 from tardyp/owners_ui

display owners instead of owner in the UI
buildbot · Mar 14, 2019 · 19417a1 · 19417a1
2 parents 9f3e449 + ee1f853
commit 19417a1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/master/buildbot/newsfragments/owners.bugfix b/master/buildbot/newsfragments/owners.bugfix
@@ -0,0 +1 @@
+The builder page UI now correctly shows the list of owners for each build.
diff --git a/www/base/src/app/builders/builder/builder.controller.coffee b/www/base/src/app/builders/builder/builder.controller.coffee
@@ -95,7 +95,7 @@ class Builder extends Controller
             if $stateParams.numbuilds?
                 $scope.numbuilds = +$stateParams.numbuilds
             $scope.builds = builder.getBuilds
-                property: ["owner", "workername"]
+                property: ["owners", "workername"]
                 limit: $scope.numbuilds
                 order: '-number'
             $scope.buildrequests = builder.getBuildrequests(claimed:false)

diff --git a/www/base/src/app/builders/builder/builder.tpl.jade b/www/base/src/app/builders/builder/builder.tpl.jade
@@ -10,7 +10,7 @@
           tr
             td(width='100px') #
             td(width='150px') Submitted At
-            td(width='150px') Owner
+            td(width='150px') Owners
             td Properties
           tr(ng-repeat='br in buildrequests | orderBy:"-submitted_at"', ng-if="br.claimed==false" )
               td
@@ -20,7 +20,7 @@
                 span(title="{{br.submitted_at | dateformat:'LLL'}}")
                   | {{br.submitted_at | timeago }}
               td
-                span {{br.properties.owner[0]}}
+                span(ng-repeat="owner in br.properties.owners[0]") {{owner}}
               td
       uib-tab(heading="Build times")
         line-plot(data="successful_builds", xattr="started_at", yattr="duration", xunit="timestamp", yunit="seconds", width=800, height=200)