Merge lp:~intellectronica/launchpad/patch-badge-performance into lp:launchpad/db-devel

[Eleanor Berger]

[Eleanor Berger (intellectronica)]

This branch optimizes the way we display the patch badge in bug listings by extending the decorator for bugtask listing items to include has_patch.

If the diff looks a bit short it's because:

1. The SQL for getting has_patch has already been added in the original branch (just not used).
2. I have not added any additional tests (since existing tests cover the functionality). I did test manually that the inefficient code path is not being entered when using this version.

[Aaron Bentley (abentley)]

review: Approve

[Gary Poster (gary)]

review: Approve (release-critical)

=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2010-01-22 17:31:00 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2010-01-26 09:55:24 +0000
@@ -888,6 +888,10 @@
         """See `BugTaskImageDisplayAPI`"""
         return self._context.has_specification
 
+    def _hasPatch(self):
+        """See `BugTaskImageDisplayAPI`"""
+        return self._context.has_patch
+
 
 class QuestionImageDisplayAPI(ObjectImageDisplayAPI):
     """Adapter for IQuestion to a formatted string. Used for image:icon."""

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-01-22 21:04:27 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-01-26 09:55:24 +0000
@@ -1935,12 +1935,13 @@
     delegates(IBugTask, 'bugtask')
 
     def __init__(self, bugtask, has_mentoring_offer, has_bug_branch,
-                 has_specification, request=None):
+                 has_specification, has_patch, request=None):
         self.bugtask = bugtask
         self.review_action_widget = None
         self.has_mentoring_offer = has_mentoring_offer
         self.has_bug_branch = has_bug_branch
         self.has_specification = has_specification
+        self.has_patch = has_patch
         self.request = request
 
     @property
@@ -1982,6 +1983,7 @@
             badge_property['has_mentoring_offer'],
             badge_property['has_branch'],
             badge_property['has_specification'],
+            badge_property['has_patch'],
             request=self.request)
 
     def getBugListingItems(self):

=== modified file 'lib/lp/bugs/browser/cvereport.py'
--- lib/lp/bugs/browser/cvereport.py	2009-06-25 00:40:31 +0000
+++ lib/lp/bugs/browser/cvereport.py	2010-01-26 09:55:24 +0000
@@ -77,7 +77,8 @@
                 bugtask,
                 has_mentoring_offer=badges['has_mentoring_offer'],
                 has_bug_branch=badges['has_branch'],
-                has_specification=badges['has_specification'])
+                has_specification=badges['has_specification'],
+                has_patch=badges['has_patch'])
             if not bugtaskcves.has_key(bugtask.bug.id):
                 bugtaskcves[bugtask.bug.id] = BugTaskCve()
             bugtaskcves[bugtask.bug.id].bugtasks.append(bugtask)

=== modified file 'lib/lp/registry/browser/milestone.py'
--- lib/lp/registry/browser/milestone.py	2010-01-11 14:26:27 +0000
+++ lib/lp/registry/browser/milestone.py	2010-01-26 09:55:24 +0000
@@ -244,7 +244,8 @@
             bugtask,
             badge_property['has_mentoring_offer'],
             badge_property['has_branch'],
-            badge_property['has_specification'])
+            badge_property['has_specification'],
+            badge_property['has_patch'])
 
     @cachedproperty
     def bugtasks(self):