Merge lp:~deryck/launchpad/series-targeted-with-zero-bugs-364712 into lp:launchpad

[Deryck Hodge]

[Deryck Hodge (deryck)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

= Summary =

Bug 364712 notes that the list of links in the "Series-targeted bugs" on
a project's bugs home page lists obsolete series (or series with no bugs
listed).

== Proposed fix ==

A series should not be listed if it has no open bugs.

== Pre-implementation notes ==

None

== Implementation details ==

This branch fixes that by not adding the series to the list of
series_buglistings if the series.open_bugtasks.count() is 0.

Also, the template is modified to not included the portlet if the list
is empty using a tal:condition on series_buglistings.

There are some unused import clean ups here as well, which make lint
complained about.

== Tests ==

Run the now updated test:

./bin/test -vv -t xx-portlets-bug-series.txt

== Demo and Q/A ==

Demo:
    * Go to http://bugs.launchpad.dev/firefox
    * Verify that the 1.0 series is shown, with 1 bug
    * Go to https://bugs.launchpad.dev/jokosher
    * Verify that there is no "Series-targeted bugs" section

Q/A
    * Go to https://bugs.edge.launchpad.net/bzr
    * Verify that there is no "Series-targeted bugs" section
    * Go to https://bugs.edge.launchpad.net/malone
    * Verify that only the 1.2 series is listed, with 4 bugs

= 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/bugs/browser/bugtarget.py
  lib/lp/bugs/templates/bugtask-portlet-seriesbugs.pt
  lib/lp/bugs/stories/bugs/xx-portlets-bug-series.txt

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkqJlvUACgkQ4glRK0DaE8jjeQCg4/m+95yKNsNRDIhGU7fj9wS+
8J4An12G6d/WvHBApXmauazYyH8VFRRa
=vvUS
-----END PGP SIGNATURE-----

[Eleanor Berger (intellectronica)]

review: Approve

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2009-07-27 14:14:53 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2009-08-17 17:09:23 +0000
@@ -31,7 +31,6 @@
 from zope.app.form.browser import TextWidget
 from zope.app.form.interfaces import InputErrors
 from zope.component import getUtility
-from zope.event import notify
 from zope import formlib
 from zope.interface import implements
 from zope.publisher.interfaces import NotFound
@@ -39,8 +38,6 @@
 from zope.schema import Choice
 from zope.schema.vocabulary import SimpleVocabulary
 
-from lazr.lifecycle.event import ObjectCreatedEvent
-
 from canonical.cachedproperty import cachedproperty
 from lp.bugs.browser.bugtask import BugTaskSearchListingView
 from canonical.launchpad.browser.feeds import (
@@ -70,7 +67,7 @@
 from lp.registry.interfaces.productseries import IProductSeries
 from canonical.launchpad.webapp import (
     LaunchpadEditFormView, LaunchpadFormView, LaunchpadView, action,
-    canonical_url, custom_widget, safe_action, urlappend)
+    canonical_url, custom_widget, safe_action)
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.tales import BugTrackerFormatterAPI
 from canonical.launchpad.validators.name import valid_name_pattern
@@ -1139,11 +1136,13 @@
 
         series_buglistings = []
         for series in serieses:
-            series_buglistings.append(
-                dict(
-                    title=series.name,
-                    url=canonical_url(series) + "/+bugs",
-                    count=series.open_bugtasks.count()))
+            series_bug_count = series.open_bugtasks.count()
+            if series_bug_count > 0:
+                series_buglistings.append(
+                    dict(
+                        title=series.name,
+                        url=canonical_url(series) + "/+bugs",
+                        count=series_bug_count))
 
         return series_buglistings
 

=== modified file 'lib/lp/bugs/stories/bugs/xx-portlets-bug-series.txt'
--- lib/lp/bugs/stories/bugs/xx-portlets-bug-series.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugs/xx-portlets-bug-series.txt	2009-08-17 16:41:22 +0000
@@ -5,7 +5,6 @@
   >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
   >>> print extract_text(portlet)
   Series-targeted bugs
-  sid   0
   sarge 1
   woody 2
 
@@ -13,7 +12,6 @@
   >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
   >>> print extract_text(portlet)
   Series-targeted bugs
-  sid   0
   sarge 1
   woody 2
 
@@ -21,13 +19,11 @@
   >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
   >>> print extract_text(portlet)
   Series-targeted bugs
-  breezy-autotest 0
-  grumpy          0
   hoary           1
   warty           1
 
-  >>> print anon_browser.getLink("breezy-autotest").url
-  http://bugs.launchpad.dev/ubuntu/breezy-autotest/+bugs
+  >>> print anon_browser.getLink("hoary").url
+  http://bugs.launchpad.dev/ubuntu/hoary/+bugs
 
 The same portlet is available on the bugs homepage for the distro:
 
@@ -35,7 +31,6 @@
   >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
   >>> print extract_text(portlet)
   Series-targeted bugs
-  sid   0
   sarge 1
   woody 2
 
@@ -43,7 +38,6 @@
   >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
   >>> print extract_text(portlet)
   Series-targeted bugs
-  sid   0
   sarge 1
   woody 2
 
@@ -55,26 +49,22 @@
   >>> print extract_text(portlet)
   Series-targeted bugs
   1.0   1
-  trunk 0
 
   >>> anon_browser.open("http://bugs.launchpad.dev/firefox/1.0/+bugs")
   >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
   >>> print extract_text(portlet)
   Series-targeted bugs
   1.0   1
-  trunk 0
 
   >>> anon_browser.open("http://bugs.launchpad.dev/firefox/+bugs-index")
   >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
   >>> print extract_text(portlet)
   Series-targeted bugs
   1.0   1
-  trunk 0
 
   >>> anon_browser.open("http://bugs.launchpad.dev/firefox/1.0/+bugs-index")
   >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
   >>> print extract_text(portlet)
   Series-targeted bugs
   1.0   1
-  trunk 0
 

=== modified file 'lib/lp/bugs/templates/bugtask-portlet-seriesbugs.pt'
--- lib/lp/bugs/templates/bugtask-portlet-seriesbugs.pt	2009-07-17 17:59:07 +0000
+++ lib/lp/bugs/templates/bugtask-portlet-seriesbugs.pt	2009-08-17 16:02:53 +0000
@@ -3,7 +3,8 @@
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   class="portlet" id="portlet-release-critical-bugs"
-  tal:define="series_buglistings view/series_buglistings">
+  tal:define="series_buglistings view/series_buglistings"
+  tal:condition="series_buglistings">
 
   <h2>Series-targeted bugs</h2>