Merge lp:~salgado/launchpad/bug-434349 into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

= Summary =

Fix the bug by only displaying bugs/blueprints summary for active
milestones

== Tests ==

./bin/test -vvt milestone-views.txt

== Demo and Q/A ==

https://staging.launchpad.net/ubuntu/jaunty

It may timeout on staging, but it will certainly perform much better on
production. Still not ideal, but good enough.

= 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/productseries-milestone-table-row.pt
  lib/lp/registry/browser/tests/milestone-views.txt
  lib/lp/registry/browser/__init__.py
  lib/lp/registry/browser/milestone.py

[Curtis Hovey (sinzui)]

This is great. Thanks for the cleanup. We can certainly use this code even if we improve the performance issues.

review: Approve

[Brad Crittenden (bac)]

I think the milestone queries may need some optimization but this fix should work for now. Thanks for taking it on.

review: Approve (release-critical)

=== modified file 'lib/lp/registry/browser/__init__.py'
--- lib/lp/registry/browser/__init__.py	2009-09-10 17:15:46 +0000
+++ lib/lp/registry/browser/__init__.py	2009-09-22 16:21:12 +0000
@@ -6,7 +6,7 @@
 __metaclass__ = type
 
 __all__ = [
-    'get_status_count',
+    'get_status_counts',
     'MilestoneOverlayMixin',
     'RegistryEditFormView',
     'RegistryDeleteViewMixin',

=== modified file 'lib/lp/registry/browser/milestone.py'
--- lib/lp/registry/browser/milestone.py	2009-09-15 01:42:42 +0000
+++ lib/lp/registry/browser/milestone.py	2009-09-22 16:24:23 +0000
@@ -25,7 +25,6 @@
 
 from canonical.cachedproperty import cachedproperty
 from canonical.launchpad import _
-from canonical.lazr.utils import smartquote
 from lp.bugs.browser.bugtask import BugTaskListingItem
 from lp.bugs.interfaces.bugtask import (
     BugTaskSearchParams, IBugTaskSet)
@@ -155,6 +154,11 @@
         self.processDeleteFiles()
 
     @property
+    def should_show_bugs_and_blueprints(self):
+        """Display the summary of bugs/blueprints for this milestone?"""
+        return (not self.show_series_context) and self.milestone.active
+
+    @property
     def page_title(self):
         """Return the HTML page title."""
         return self.context.title

=== modified file 'lib/lp/registry/browser/tests/milestone-views.txt'
--- lib/lp/registry/browser/tests/milestone-views.txt	2009-09-17 02:38:00 +0000
+++ lib/lp/registry/browser/tests/milestone-views.txt	2009-09-22 16:21:12 +0000
@@ -83,6 +83,20 @@
     ...     print spec.title
     dodo
 
+On a IDistroSeries/IProductSeries main page, we use this view to list detailed
+information about the context's milestones. However, generating the summary of
+bugs/blueprints for a milestone is rather expensive, so we only do that for
+active milestones.
+
+    >>> milestone.active
+    True
+    >>> view.should_show_bugs_and_blueprints
+    True
+
+    >>> milestone.active = False
+    >>> view.should_show_bugs_and_blueprints
+    False
+
 The bugtasks are decorated. They are wrapped by the BugTaskListingItem
 that has cached information to create badges quickly. The
 _bug_badge_properties property provides the additional information that

=== modified file 'lib/lp/registry/templates/productseries-milestone-table-row.pt'
--- lib/lp/registry/templates/productseries-milestone-table-row.pt	2009-09-11 14:03:37 +0000
+++ lib/lp/registry/templates/productseries-milestone-table-row.pt	2009-09-22 16:21:12 +0000
@@ -71,7 +71,8 @@
     <td>
       <tal:summary
         content="structure milestone/summary/fmt:shorten/80" />
-      <tal:bug-blueprint-details condition="not: view/show_series_context">
+      <tal:bug-blueprint-details
+          condition="view/should_show_bugs_and_blueprints">
       <tal:bugtasks condition="view/bugtasks">
         <br tal:omit-tag="not: view/milestone/summary" />
         Bugs targeted: