Merge lp:~allenap/launchpad/fmt-link-for-distroseries-bug-425803 into lp:launchpad

[Gavin Panella]

[Gavin Panella (allenap)]

Add a fmt TALES formatter specifically for IDistroSeries, and use it
in at least one place.

./bin/test -vvct 'cve-report|tales.txt'

Lint free (after removing line 2826 from tales.py).

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/doc/tales.txt'
--- lib/canonical/launchpad/doc/tales.txt	2009-09-04 13:46:47 +0000
+++ lib/canonical/launchpad/doc/tales.txt	2009-09-10 10:49:44 +0000
@@ -346,6 +346,8 @@
   * blueprint-branch links
   * projects
   * questions
+  * distributions
+  * distroseries
 
 
 Person entries
@@ -647,6 +649,22 @@
     u'<a... class="sprite question">1:...</a>'
 
 
+Distributions
+.............
+
+    >>> distribution = factory.makeDistribution()
+    >>> test_tales("distribution/fmt:link", distribution=distribution)
+    u'<a... class="sprite distribution">...</a>'
+
+
+Distribution Series
+...................
+
+    >>> distroseries = factory.makeDistroArchSeries().distroseries
+    >>> test_tales("distroseries/fmt:link", distroseries=distroseries)
+    u'<a href="...">...</a>'
+
+
 The fmt: namespace for specially formatted object info
 ------------------------------------------------------
 

=== modified file 'lib/canonical/launchpad/webapp/configure.zcml'
--- lib/canonical/launchpad/webapp/configure.zcml	2009-09-01 08:37:31 +0000
+++ lib/canonical/launchpad/webapp/configure.zcml	2009-09-10 10:49:44 +0000
@@ -365,6 +365,13 @@
         />
 
     <adapter
+        for="lp.registry.interfaces.distroseries.IDistroSeries"
+        provides="zope.traversing.interfaces.IPathAdapter"
+        factory="canonical.launchpad.webapp.tales.DistroSeriesFormatterAPI"
+        name="fmt"
+        />
+
+    <adapter
         for="canonical.launchpad.interfaces.IBug"
         provides="zope.traversing.interfaces.IPathAdapter"
         factory="canonical.launchpad.webapp.tales.BugFormatterAPI"

=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2009-09-07 12:16:29 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2009-09-10 12:39:52 +0000
@@ -1215,6 +1215,17 @@
         return html
 
 
+class DistroSeriesFormatterAPI(CustomizableFormatter):
+    """Adapter for IDistroSeries objects to a formatted string."""
+
+    _link_summary_template = '%(displayname)s'
+    _link_permission = 'zope.Public'
+
+    def _link_summary_values(self):
+        displayname = self._context.displayname
+        return {'displayname': displayname}
+
+
 class SourcePackageFormatterAPI(CustomizableFormatter):
     """Adapter for ISourcePackage objects to a formatted string."""
 
@@ -2812,7 +2823,6 @@
             # Only linkify if person exists and does not want to hide
             # their email addresses.
             if person is not None and not person.hide_email_addresses:
-                person_formatter = PersonFormatterAPI(person)
                 css_sprite = ObjectImageDisplayAPI(person).sprite_css()
                 text = text.replace(
                     address, '<a href="%s" class="%s">&nbsp;%s</a>' % (

=== modified file 'lib/lp/bugs/templates/distribution-cvereport.pt'
--- lib/lp/bugs/templates/distribution-cvereport.pt	2009-09-07 09:39:50 +0000
+++ lib/lp/bugs/templates/distribution-cvereport.pt	2009-09-10 12:32:50 +0000
@@ -43,10 +43,8 @@
     </tal:no_series>
     <tal:series condition="serieses">
       <ul>
-        <li tal:repeat="series serieses">
-          <a tal:attributes="href series/fmt:url/+cve"
-             tal:content="series/displayname" />
-        </li>
+        <li tal:repeat="series serieses"
+            tal:content="structure series/fmt:link/+cve" />
       </ul>
     </tal:series>
   </div>