Launchpad itself

Merge lp:~wgrant/launchpad/bug-756983 into lp:launchpad

  1. bug-756983
  2. Merge into devel
Proposed by William Grant
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: 12792
Proposed branch: lp:~wgrant/launchpad/bug-756983
Merge into: lp:launchpad
Diff against target: 80 lines (+17/-6)
4 files modified
lib/lp/registry/stories/distribution/xx-distribution-overview.txt (+7/-2)
lib/lp/registry/stories/distroseries/xx-distroseries-index.txt (+7/-2)
lib/lp/registry/templates/distribution-index.pt (+1/-1)
lib/lp/registry/templates/distroseries-details.pt (+2/-1)
To merge this branch: bzr merge lp:~wgrant/launchpad/bug-756983
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+57097@code.launchpad.net

Commit message

[r=lifeless][bug=756983] Hide derived series information on Distribution:+index and DistroSeries:+index behind the flag.

Description of the change

DistroSeries:+index and Distribution:+index each had a list of derived series added, but production data is bad and it's not clear that we want to show this on +index anyway. This branch hides it behind the usual soyuz.derived-series-ui.enabled feature flag.

To post a comment you must log in.
Revision history for this message
Robert Collins (lifeless) wrote :

Thanks for doing this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/stories/distribution/xx-distribution-overview.txt'
2--- lib/lp/registry/stories/distribution/xx-distribution-overview.txt 2011-04-08 13:37:07 +0000
3+++ lib/lp/registry/stories/distribution/xx-distribution-overview.txt 2011-04-11 00:53:25 +0000
4@@ -83,7 +83,11 @@
5 The 5 latest derivatives are displayed on the home page
6 along with a link to list all of them.
7
8- >>> anon_browser.open('http://launchpad.dev/ubuntu')
9+ >>> from lp.services.features.testing import FeatureFixture
10+ >>> derivation_enabled = FeatureFixture(
11+ ... {'soyuz.derived-series-ui.enabled': 'on'})
12+ >>> with derivation_enabled:
13+ ... anon_browser.open('http://launchpad.dev/ubuntu')
14 >>> print extract_text(find_tag_by_id(anon_browser.contents,
15 ... 'derivatives'))
16 Latest derivatives
17@@ -110,7 +114,8 @@
18 If there is no derivatives, the link to the derivatives page is
19 not there.
20
21- >>> anon_browser.open('http://launchpad.dev/ubuntutest')
22+ >>> with derivation_enabled:
23+ ... anon_browser.open('http://launchpad.dev/ubuntutest')
24 >>> print extract_text(find_tag_by_id(anon_browser.contents,
25 ... 'derivatives'))
26 Latest derivatives
27
28=== modified file 'lib/lp/registry/stories/distroseries/xx-distroseries-index.txt'
29--- lib/lp/registry/stories/distroseries/xx-distroseries-index.txt 2011-04-08 13:04:24 +0000
30+++ lib/lp/registry/stories/distroseries/xx-distroseries-index.txt 2011-04-11 00:53:25 +0000
31@@ -16,7 +16,11 @@
32 The distroseries pages presents the 'registering' information besides
33 its main 'heading'.
34
35- >>> anon_browser.open('http://launchpad.dev/ubuntu/warty')
36+ >>> from lp.services.features.testing import FeatureFixture
37+ >>> derivation_enabled = FeatureFixture(
38+ ... {'soyuz.derived-series-ui.enabled': 'on'})
39+ >>> with derivation_enabled:
40+ ... anon_browser.open('http://launchpad.dev/ubuntu/warty')
41
42 >>> print extract_text(
43 ... find_tag_by_id(anon_browser.contents, 'registration'))
44@@ -54,7 +58,8 @@
45 On series that have no source or binary packages, the portlet will
46 change its text slightly to annouce this:
47
48- >>> anon_browser.open('http://launchpad.dev/debian/sarge')
49+ >>> with derivation_enabled:
50+ ... anon_browser.open('http://launchpad.dev/debian/sarge')
51 >>> print extract_text(
52 ... find_portlet(anon_browser.contents, 'Series information'))
53 Series information
54
55=== modified file 'lib/lp/registry/templates/distribution-index.pt'
56--- lib/lp/registry/templates/distribution-index.pt 2011-04-08 07:43:39 +0000
57+++ lib/lp/registry/templates/distribution-index.pt 2011-04-11 00:53:25 +0000
58@@ -63,7 +63,7 @@
59 <div class="yui-u">
60 <tal:series replace="structure context/@@+series-and-milestones" />
61 </div>
62- <div class="yui-u">
63+ <div class="yui-u" tal:condition="features/soyuz.derived-series-ui.enabled">
64 <tal:series replace="structure context/@@+derivatives-slot" />
65 </div>
66 </div>
67
68=== modified file 'lib/lp/registry/templates/distroseries-details.pt'
69--- lib/lp/registry/templates/distroseries-details.pt 2011-04-08 11:00:16 +0000
70+++ lib/lp/registry/templates/distroseries-details.pt 2011-04-11 00:53:25 +0000
71@@ -60,7 +60,8 @@
72 </dd>
73 </dl>
74
75- <dl tal:define="all_child_series context/getDerivedSeries">
76+ <dl tal:condition="request/features/soyuz.derived-series-ui.enabled"
77+ tal:define="all_child_series context/getDerivedSeries">
78 <dt>Derived series:</dt>
79 <dd>
80 <tal:per_child_series repeat="child_series all_child_series">