Merge pull request #1392 from benallard/properties_web

Show the Properties on the web interface
buildbot · Nov 27, 2014 · 7a432ba · 7a432ba
2 parents df3f5ed + 351591d
commit 7a432ba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/www/base/src/app/builders/build/build.controller.coffee b/www/base/src/app/builders/build/build.controller.coffee
@@ -31,11 +31,11 @@ class Build extends Controller
             buildbotService.one('builders', builderid).one('builds', buildnumber + 1).bind($scope, dest_key:"nextbuild")
             buildbotService.one('builds', build.id).all('changes').bind($scope)
             buildbotService.one("buildslaves", build.buildslaveid).bind($scope)
+            buildbotService.one("builds", build.id).all("properties").bind($scope)
             buildbotService.one("buildrequests", build.buildrequestid)
             .bind($scope).then (buildrequest) ->
                 buildset = buildbotService.one("buildsets", buildrequest.buildsetid)
                 buildset.bind($scope)
-                buildset.one("properties").bind($scope, dest_key:'properties')
                 recentStorage.addBuild
                     link: "#/builders/#{$scope.builder.builderid}/build/#{$scope.build.number}"
                     caption: "#{$scope.builder.name} / #{$scope.build.number}"
diff --git a/www/base/src/app/builders/build/build.tpl.jade b/www/base/src/app/builders/build/build.tpl.jade
@@ -12,8 +12,18 @@
       buildsummary(ng-if="build", buildid="build.buildid")
     .col-sm-7
       tabset
-          tab(heading="buildrequest properties")
-              rawdata(data="properties")
+          tab(heading="properties")
+            table.table.table-hover.table-striped.table-condensed
+              thead
+                tr
+                  th Name
+                  th Value
+                  th Source
+              tbody
+                tr(ng-repeat="(name, value) in properties[0]._raw_data")
+                  td {{ name }}
+                  td {{ value[0] }}
+                  td {{ value[1] }}
           tab(heading="{{buildslave.name}}")
               rawdata(data="buildslave")
           tab(heading="changes")