Merge lp:~thumper/launchpad/recipe-builds into lp:launchpad

Proposed by Tim Penhey on 2010-11-09
Status: Merged
Approved by: Robert Collins on 2010-11-10
Approved revision: no longer in the source branch.
Merged at revision: 11901
Proposed branch: lp:~thumper/launchpad/recipe-builds
Merge into: lp:launchpad
Diff against target: 96 lines (+17/-8)
3 files modified
lib/lp/app/browser/configure.zcml (+6/-0)
lib/lp/code/browser/tests/test_sourcepackagerecipe.py (+4/-4)
lib/lp/code/templates/sourcepackagerecipe-index.pt (+7/-4)
To merge this branch: bzr merge lp:~thumper/launchpad/recipe-builds
Reviewer Review Type Date Requested Status
Robert Collins (community) 2010-11-09 Approve on 2010-11-10
Review via email: mp+40489@code.launchpad.net

Commit Message

Change build records heading and add build images.

Description of the Change

Very simple branch that adds an adapter for build status images, and changes the title of "Build records" to "Latest builds".

To post a comment you must log in.
Robert Collins (lifeless) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/app/browser/configure.zcml'
2--- lib/lp/app/browser/configure.zcml 2010-10-22 03:35:41 +0000
3+++ lib/lp/app/browser/configure.zcml 2010-11-10 20:56:50 +0000
4@@ -203,6 +203,12 @@
5 factory="lp.app.browser.tales.BuildImageDisplayAPI"
6 name="image"
7 />
8+ <adapter
9+ for="lp.code.interfaces.sourcepackagerecipebuild.ISourcePackageRecipeBuild"
10+ provides="zope.traversing.interfaces.IPathAdapter"
11+ factory="lp.app.browser.tales.BuildImageDisplayAPI"
12+ name="image"
13+ />
14
15 <adapter
16 for="lp.soyuz.interfaces.archive.IArchive"
17
18=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
19--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-11-05 18:30:21 +0000
20+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py 2010-11-10 20:56:50 +0000
21@@ -664,7 +664,7 @@
22 Daily build archive: Secret PPA
23 Distribution series: Secret Squirrel
24
25- Build records
26+ Latest builds
27 Status Time Distribution series Archive
28 Successful build on 2010-03-16 Secret Squirrel Secret PPA
29 Request build\(s\)
30@@ -677,7 +677,7 @@
31 """A message should be shown when there are no builds."""
32 recipe = self.makeRecipe()
33 self.assertTextMatchesExpressionIgnoreWhitespace("""\
34- Build records
35+ Latest builds
36 Status Time Distribution series Archive
37 This recipe has not been built yet.""", self.getMainText(recipe))
38
39@@ -686,7 +686,7 @@
40 removeSecurityProxy(self.factory.makeSourcePackageRecipeBuild(
41 recipe=recipe, distroseries=self.squirrel, archive=self.ppa))
42 self.assertTextMatchesExpressionIgnoreWhitespace("""
43- Build records
44+ Latest builds
45 Status Time Distribution series Archive
46 No suitable builders Secret Squirrel Secret PPA
47 Request build\(s\)""", self.getMainText(recipe))
48@@ -704,7 +704,7 @@
49 self.makeBuildJob(recipe)
50 self.factory.makeBuilder()
51 pattern = """\
52- Build records
53+ Latest builds
54 Status Time Distribution series Archive
55 Pending build in .* \(estimated\) Secret Squirrel Secret PPA
56 Request build\(s\)
57
58=== modified file 'lib/lp/code/templates/sourcepackagerecipe-index.pt'
59--- lib/lp/code/templates/sourcepackagerecipe-index.pt 2010-08-05 18:20:28 +0000
60+++ lib/lp/code/templates/sourcepackagerecipe-index.pt 2010-11-10 20:56:50 +0000
61@@ -81,7 +81,7 @@
62 </div>
63 <div class="yui-g">
64 <div class="portlet">
65- <h2>Build records</h2>
66+ <h2>Latest builds</h2>
67 <table class="listing" style='margin-bottom: 1em;'>
68 <thead>
69 <tr>
70@@ -93,13 +93,15 @@
71 </thead>
72 <tbody>
73 <tr tal:repeat="build view/builds">
74+ <tal:build-view define="buildview nocall:build/@@+index">
75 <td>
76- <a tal:content="build/@@+index/status"
77+ <span tal:replace="structure build/image:icon" />
78+ <a tal:content="buildview/status"
79 tal:attributes="href build/fmt:url"></a>
80 </td>
81 <td>
82- <tal:date replace="build/@@+index/date/fmt:displaydate" />
83- <tal:estimate condition="build/@@+index/estimate">
84+ <tal:date replace="buildview/date/fmt:displaydate" />
85+ <tal:estimate condition="buildview/estimate">
86 (estimated)
87 </tal:estimate>
88 </td>
89@@ -110,6 +112,7 @@
90 <td>
91 <tal:archive replace="structure build/archive/fmt:link"/>
92 </td>
93+ </tal:build-view>
94 </tr>
95 </tbody>
96 </table>