Merge lp:~jcsackett/launchpad/remove-cache-private-650668 into lp:launchpad

Proposed by j.c.sackett
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 11674
Proposed branch: lp:~jcsackett/launchpad/remove-cache-private-650668
Merge into: lp:launchpad
Diff against target: 33 lines (+1/-4)
2 files modified
lib/lp/registry/templates/person-related-software.pt (+0/-2)
lib/lp/registry/templates/productseries-milestone-table-row.pt (+1/-2)
To merge this branch: bzr merge lp:~jcsackett/launchpad/remove-cache-private-650668
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+37145@code.launchpad.net

Commit message

Removes instances of cache:private in the registry templates.

Description of the change

Summary
=======

Removes the two instances of cache:private in the registry app, as they're unneeded and cause errors.

Proposed Fix
============

Remove the two instances the cache:private directive is used in the registry templates.

Pre-Implementation Talk
=======================

Spoke with Curtis Hovey.

Implementation details
======================

As in proposed.

Tests
=====

bin/test -t TestMilestoneViews
bin/test -t test_person_views
bin/test -t TestProductSeriesViews

Demo and Q/A
============

Related software on a ~person page should still show normally; productseries and milestone views should all show up normally.

Lint
====

make lint output:

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/registry/templates/person-related-software.pt
  lib/lp/registry/templates/productseries-milestone-table-row.pt

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/registry/templates/person-related-software.pt'
--- lib/lp/registry/templates/person-related-software.pt 2010-07-09 22:56:40 +0000
+++ lib/lp/registry/templates/person-related-software.pt 2010-10-04 12:23:49 +0000
@@ -18,7 +18,6 @@
18 <tal:navlinks replace="structure context/@@+related-software-navlinks"/>18 <tal:navlinks replace="structure context/@@+related-software-navlinks"/>
19 </div>19 </div>
2020
21 <tal:cache content="cache:private, 30 minute">
22 <div id="packages">21 <div id="packages">
2322
24 <tal:maintained-packages23 <tal:maintained-packages
@@ -151,7 +150,6 @@
151 doesn't own or drive any projects.150 doesn't own or drive any projects.
152 </p>151 </p>
153 </div>152 </div>
154 </tal:cache>
155</div>153</div>
156154
157<metal:macros fill-slot="bogus">155<metal:macros fill-slot="bogus">
158156
=== modified file 'lib/lp/registry/templates/productseries-milestone-table-row.pt'
--- lib/lp/registry/templates/productseries-milestone-table-row.pt 2010-08-27 15:44:38 +0000
+++ lib/lp/registry/templates/productseries-milestone-table-row.pt 2010-10-04 12:23:49 +0000
@@ -4,8 +4,7 @@
4 xmlns:i18n="http://xml.zope.org/namespaces/i18n"4 xmlns:i18n="http://xml.zope.org/namespaces/i18n"
5 define="milestone_menu view/milestone/menu:overview;5 define="milestone_menu view/milestone/menu:overview;
6 milestone view/milestone;6 milestone view/milestone;
7 release view/release"7 release view/release">
8 tal:content="cache:private, 1 hour, milestone/id">
9 <tr>8 <tr>
10 <td>9 <td>
11 <img src="/@@/milestone" alt="" />10 <img src="/@@/milestone" alt="" />