Launchpad itself

Merge lp:~rockstar/launchpad/person-recipe-listings into lp:launchpad

  1. person-recipe-listings
  2. Merge into devel
Proposed by Paul Hummer
Status: Merged
Approved by: Māris Fogels
Approved revision: no longer in the source branch.
Merged at revision: 11304
Proposed branch: lp:~rockstar/launchpad/person-recipe-listings
Merge into: lp:launchpad
Diff against target: 52 lines (+8/-7)
3 files modified
lib/lp/registry/browser/person.py (+2/-2)
lib/lp/registry/templates/person-portlet-contact-details.pt (+0/-5)
lib/lp/soyuz/templates/person-portlet-ppas.pt (+6/-0)
To merge this branch: bzr merge lp:~rockstar/launchpad/person-recipe-listings
Reviewer Review Type Date Requested Status
Māris Fogels (community) code Approve
Review via email: mp+31688@code.launchpad.net

Description of the change

This branch is really easy. It moves a person's recipe links to be part of the ppa portlet instead of where it is now. It fixes bug #592937.

To post a comment you must log in.
Revision history for this message
Māris Fogels (mars) wrote :

Hi Paul,

This looks good to me. As noted on IRC, the 'earma' change is a typo that slipped by submission. I wouldn't be surprised if a portlet view test caught this though.

r=mars

Maris

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2010-08-03 03:43:33 +0000
+++ lib/lp/registry/browser/person.py 2010-08-05 16:18:23 +0000
@@ -1264,7 +1264,7 @@
1264 return Link(target, text, icon=icon, enabled=enabled)1264 return Link(target, text, icon=icon, enabled=enabled)
12651265
12661266
1267class TeamOverviewMenu(ApplicationMenu, TeamMenuMixin):1267class TeamOverviewMenu(ApplicationMenu, TeamMenuMixin, HasRecipesMenuMixin):
12681268
1269 usedfor = ITeam1269 usedfor = ITeam
1270 facet = 'overview'1270 facet = 'overview'
@@ -1275,7 +1275,7 @@
1275 'editlanguages', 'map', 'polls',1275 'editlanguages', 'map', 'polls',
1276 'add_poll', 'join', 'leave', 'add_my_teams',1276 'add_poll', 'join', 'leave', 'add_my_teams',
1277 'reassign', 'projects', 'activate_ppa', 'maintained', 'ppa',1277 'reassign', 'projects', 'activate_ppa', 'maintained', 'ppa',
1278 'related_software_summary']1278 'related_software_summary', 'view_recipes']
12791279
12801280
1281class TeamOverviewNavigationMenu(NavigationMenu, TeamMenuMixin):1281class TeamOverviewNavigationMenu(NavigationMenu, TeamMenuMixin):
12821282
=== modified file 'lib/lp/registry/templates/person-portlet-contact-details.pt'
--- lib/lp/registry/templates/person-portlet-contact-details.pt 2010-06-24 14:10:56 +0000
+++ lib/lp/registry/templates/person-portlet-contact-details.pt 2010-08-05 16:18:23 +0000
@@ -195,11 +195,6 @@
195 </dd>195 </dd>
196 </dl>196 </dl>
197 </div>197 </div>
198 <div tal:define="link context/menu:overview/view_recipes"
199 tal:condition="link/enabled">
200 <a tal:replace="structure link/fmt:link" />
201 </div>
202
203198
204</div>199</div>
205200
206201
=== modified file 'lib/lp/soyuz/templates/person-portlet-ppas.pt'
--- lib/lp/soyuz/templates/person-portlet-ppas.pt 2010-04-19 03:36:55 +0000
+++ lib/lp/soyuz/templates/person-portlet-ppas.pt 2010-08-05 16:18:23 +0000
@@ -21,4 +21,10 @@
2121
22 </ul>22 </ul>
23 </div>23 </div>
24 <div tal:define="link context/menu:overview/view_recipes"
25 tal:condition="link/enabled">
26 <a tal:replace="structure link/fmt:link" />
27 </div>
28
29
24</tal:root>30</tal:root>