Show parent relationship for builds

It should be easy to go back to a parent build, when you are in a child build. This changes implements link, and build sumary of the parent build in a child build Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
buildbot · Jan 14, 2015 · d2e6a37 · d2e6a37
1 parent 185c404
commit d2e6a37
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/www/base/src/app/builders/build/build.controller.coffee b/www/base/src/app/builders/build/build.controller.coffee
@@ -41,6 +41,7 @@ class Build extends Controller
             buildbotService.one("builds", build.id).all("properties").bind($scope)
             buildbotService.one("buildrequests", build.buildrequestid)
             .bind($scope).then (buildrequest) ->
+                buildbotService.one("buildsets", buildrequest.buildsetid).bind($scope)
                 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
@@ -4,14 +4,16 @@
       li.previous(ng-class="{'disabled': build.number == 1}")
         a(ng-if="build.number > 1 ", ui-sref="build({build:build.number - 1})") &larr; Previous
         span(ng-if="build.number == 1") &larr; Previous
-      span(ng-if="build.complete" title="{{ build.complete_at | dateformat:'LLL' }}") Finished {{ build.complete_at | timeago }}
+      li(ng-if="build.complete" title="{{ build.complete_at | dateformat:'LLL' }}") Finished {{ build.complete_at | timeago }}
       li.next(ng-class="{'disabled': last_build}")
         a(ng-if="!last_build", ui-sref="build({build:build.number + 1})") Next &rarr;
         span(ng-if="last_build") Next &rarr;
   .row
     .col-sm-5
       buildsummary(ng-if="build", buildid="build.buildid")
     .col-sm-7
+      .row(ng-if="buildset.parent_buildid")
+          buildsummary(buildid="buildset.parent_buildid", condensed="1", prefix="{{buildset.parent_relationship}}:")
       tabset
           tab(heading="Build Properties")
             table.table.table-hover.table-striped.table-condensed

diff --git a/www/base/src/app/common/directives/buildsummary/buildsummary.directive.coffee b/www/base/src/app/common/directives/buildsummary/buildsummary.directive.coffee
@@ -3,7 +3,7 @@ class Buildsummary extends Directive('common')
         return {
             replace: true
             restrict: 'E'
-            scope: {buildid: '=', condensed: '='}
+            scope: {buildid: '=', condensed: '=', prefix: "@"}
             templateUrl: 'views/buildsummary.html'
             compile: RecursionHelper.compile
             controller: '_buildsummaryController'

diff --git a/www/base/src/app/common/directives/buildsummary/buildsummary.tpl.jade b/www/base/src/app/common/directives/buildsummary/buildsummary.tpl.jade
@@ -1,5 +1,6 @@
 .panel.panel-default(ng-class="results2class(build)")
   .panel-heading.no-select(ng-click="toggleDetails()")
+    span(ng-if="prefix") {{prefix}}&nbsp;
     a(href="#/builders/{{builder.builderid}}/build/{{build.number}}")
       | {{builder.name}}/{{build.number}}
     .pull-right