Merge ~cjwatson/launchpad:cibuild-icons into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 1768d92415a9e5ffcfbcf02963e8b600f3a93e1f
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:cibuild-icons
Merge into: launchpad:master
Diff against target: 62 lines (+40/-0)
2 files modified
lib/lp/app/browser/configure.zcml (+6/-0)
lib/lp/app/doc/tales.txt (+34/-0)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+417911@code.launchpad.net

Commit message

Configure icons for CIBuild objects

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/app/browser/configure.zcml b/lib/lp/app/browser/configure.zcml
2index 9419f7f..88985a9 100644
3--- a/lib/lp/app/browser/configure.zcml
4+++ b/lib/lp/app/browser/configure.zcml
5@@ -588,6 +588,12 @@
6 factory="lp.app.browser.tales.BuildImageDisplayAPI"
7 name="image"
8 />
9+ <adapter
10+ for="lp.code.interfaces.cibuild.ICIBuild"
11+ provides="zope.traversing.interfaces.IPathAdapter"
12+ factory="lp.app.browser.tales.BuildImageDisplayAPI"
13+ name="image"
14+ />
15
16 <adapter
17 for="lp.soyuz.interfaces.archive.IArchive"
18diff --git a/lib/lp/app/doc/tales.txt b/lib/lp/app/doc/tales.txt
19index 90c5080..b82bb61 100644
20--- a/lib/lp/app/doc/tales.txt
21+++ b/lib/lp/app/doc/tales.txt
22@@ -229,6 +229,40 @@ But the 'failed to build' build is 16x14:
23 >>> print(test_tales("build/image:icon", build=build))
24 <img width="16" height="14"...src="/@@/build-failed" />
25
26+Other build types have similar icon handling.
27+
28+ >>> from lp.charms.interfaces.charmrecipe import CHARM_RECIPE_ALLOW_CREATE
29+ >>> from lp.oci.interfaces.ocirecipe import OCI_RECIPE_ALLOW_CREATE
30+ >>> from lp.services.features.testing import FeatureFixture
31+ >>> from lp.soyuz.interfaces.livefs import LIVEFS_FEATURE_FLAG
32+
33+ >>> spr_build = factory.makeSourcePackageRecipeBuild()
34+ >>> print(test_tales("build/image:icon", build=spr_build))
35+ <img width="14" height="14"...src="/@@/build-needed" />
36+
37+ >>> with FeatureFixture({LIVEFS_FEATURE_FLAG: "on"}):
38+ ... livefs_build = factory.makeLiveFSBuild()
39+ >>> print(test_tales("build/image:icon", build=livefs_build))
40+ <img width="14" height="14"...src="/@@/build-needed" />
41+
42+ >>> snap_build = factory.makeSnapBuild()
43+ >>> print(test_tales("build/image:icon", build=snap_build))
44+ <img width="14" height="14"...src="/@@/build-needed" />
45+
46+ >>> with FeatureFixture({OCI_RECIPE_ALLOW_CREATE: "on"}):
47+ ... oci_recipe_build = factory.makeOCIRecipeBuild()
48+ >>> print(test_tales("build/image:icon", build=oci_recipe_build))
49+ <img width="14" height="14"...src="/@@/build-needed" />
50+
51+ >>> with FeatureFixture({CHARM_RECIPE_ALLOW_CREATE: "on"}):
52+ ... charm_recipe_build = factory.makeCharmRecipeBuild()
53+ >>> print(test_tales("build/image:icon", build=charm_recipe_build))
54+ <img width="14" height="14"...src="/@@/build-needed" />
55+
56+ >>> ci_build = factory.makeCIBuild()
57+ >>> print(test_tales("build/image:icon", build=ci_build))
58+ <img width="14" height="14"...src="/@@/build-needed" />
59+
60 Revision status reports have an icon for each result.
61
62 >>> from lp.code.enums import RevisionStatusResult

Subscribers

People subscribed via source and target branches

to status/vote changes: