Merge lp:~wgrant/launchpad/fix-dsp-index into lp:launchpad

[William Grant]

Fix DSP:+index expanders by using IJSONRequestCache instead of touching LP.cache directly.

Make DSP:+index use IJSONRequestCache rather than manipulating LP.cache directly. That doesn't work since r13548, which changes base-layout to clobber LP.cache rather than just setting the relevant entries.

[Steve Kowalik (stevenk)]

review: Approve (code)

=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
--- lib/lp/registry/browser/distributionsourcepackage.py	2011-07-28 17:34:34 +0000
+++ lib/lp/registry/browser/distributionsourcepackage.py	2011-08-03 04:53:24 +0000
@@ -21,6 +21,7 @@
 import operator
 
 from lazr.delegates import delegates
+from lazr.restful.interfaces import IJSONRequestCache
 import pytz
 from zope.component import (
     adapter,
@@ -336,6 +337,10 @@
         super(DistributionSourcePackageView, self).initialize()
         expose_structural_subscription_data_to_js(
             self.context, self.request, self.user)
+        IJSONRequestCache(self.request).objects['archive_context_url'] = (
+            canonical_url(
+                self.context.latest_overall_publication.archive,
+                path_only_if_possible=True))
 
     @property
     def label(self):
 
=== modified file 'lib/lp/registry/templates/distributionsourcepackage-index.pt'
--- lib/lp/registry/templates/distributionsourcepackage-index.pt	2011-07-15 11:18:47 +0000
+++ lib/lp/registry/templates/distributionsourcepackage-index.pt	2011-08-03 04:53:24 +0000
@@ -188,8 +188,6 @@
 
       </tal:rows>
     </table>
-    <script
-       tal:content="string:LP.cache['archive_context_url'] = '${archive/fmt:url}';"></script>
     <metal:js use-macro="archive/@@+macros/expandable-table-js"/>
 
   </div>