Merge lp:~bac/launchpad/bug-515171 into lp:launchpad

[Brad Crittenden]

[Brad Crittenden (bac)]

= Summary =

In review for a previous branch it was suggested I make a macro to display a messaged
based on the plurality of a suggestion count. I inadvertently left the old method in
place too, so now the message appears twice.

== Proposed fix ==

Remove the redundant parts from the page template.

== Pre-implementation notes ==

None

== Implementation details ==

As above

== Tests ==

bin/test -vvt sourcepackage-views.txt

== Demo and Q/A ==

Look at https://edge.launchpad.net/ubuntu/lucid/+source/gimp-help and verify "Is one
of these projects the upstream for this source package?" appears only once.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/templates/sourcepackage-portlet-associations.pt

[Henning Eggers (henninge)]

review: Approve (code)

=== modified file 'lib/lp/registry/templates/sourcepackage-portlet-associations.pt'
--- lib/lp/registry/templates/sourcepackage-portlet-associations.pt	2010-01-29 15:03:49 +0000
+++ lib/lp/registry/templates/sourcepackage-portlet-associations.pt	2010-02-01 13:56:17 +0000
@@ -67,13 +67,6 @@
             </b>
           </tal:message>
 
-          <div tal:condition="python: len(view.product_suggestions) > 1">
-            <b>Is one of these projects the upstream for this source
-            package?</b>
-          </div>
-          <div tal:condition="python: len(view.product_suggestions) == 1">
-            <b>Is the following project the upstream for this source package?</b>
-          </div>
           <div metal:use-macro="context/@@launchpad_form/form">
             <div class="actions" metal:fill-slot="buttons">
               <input tal:replace="structure view/link/render"/>