Merge lp:~intellectronica/launchpad/use-max-heat into lp:launchpad/db-devel

[Eleanor Berger]

[Eleanor Berger (intellectronica)]

This branch changes the way bug heat is rendered. Instead of using a constant maximum heat, we use the max_heat value for the relevant bug target. As a result of this change, using a bug view doesn't make sense any more, since we now have to know about the target (which is only available from the bugtask).

[Leonard Richardson (leonardr)]

<leonardr> intellectronica: it seems like having a MAX_HEAT in bugtask.py would still be useful. you still use it in two different files
<intellectronica> leonardr: i use it in a test. i use the value as a default, but it will be gone with a following branch which will make sure we have max_heat populated
<leonardr> intellectronica: oh, one other question. why can't the bugheatview be a view on the bugtask?
<leonardr> (assuming views are desirable in general)
<intellectronica> leonardr: it's just a case of yagni. it wasn't such a brilliant idea to use a view to begin with.
<intellectronica> all we ever did with the view is initialize manually and call it

review: Approve

=== modified file 'lib/lp/bugs/browser/bug.py'
--- lib/lp/bugs/browser/bug.py	2010-02-02 17:26:53 +0000
+++ lib/lp/bugs/browser/bug.py	2010-02-24 13:14:23 +0000
@@ -10,7 +10,6 @@
     'BugContextMenu',
     'BugEditView',
     'BugFacets',
-    'BugHeatView',
     'BugMarkAsAffectingUserView',
     'BugMarkAsDuplicateView',
     'BugNavigation',
@@ -23,13 +22,11 @@
     'BugWithoutContextView',
     'DeprecatedAssignedBugsView',
     'MaloneView',
-    'MAX_HEAT',
     ]
 
 from datetime import datetime, timedelta
 from email.MIMEMultipart import MIMEMultipart
 from email.MIMEText import MIMEText
-from math import floor
 import re
 
 import pytz
@@ -77,10 +74,6 @@
 from canonical.widgets.bug import BugTagsWidget
 from canonical.widgets.project import ProjectScopeWidget
 
-# Constant for the maximum bug heat we'll use for converting
-# IBug.heat to ratio. In the future this should come from the DB.
-# The value must be a float
-MAX_HEAT = 5000.0
 
 class BugNavigation(Navigation):
     """Navigation for the `IBug`."""
@@ -969,18 +962,3 @@
         return html.encode('utf-8')
     return renderer
 
-
-class BugHeatView(LaunchpadView):
-    """View for rendering the graphical (HTML) representation of bug heat."""
-
-    def __call__(self):
-        """Render the bug heat representation."""
-        heat_ratio = floor((self.context.heat / MAX_HEAT) * 4)
-        html = '<span>'
-        for flame in range(1, 5):
-            if flame <= heat_ratio:
-                html += '<img src="/@@/flame-icon" />'
-            else:
-                html += '<img src="/@@/flame-bw-icon" />'
-        html += '</span>'
-        return html

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-02-20 13:16:38 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-02-24 13:14:23 +0000
@@ -33,6 +33,7 @@
     'BugTaskTextView',
     'BugTaskView',
     'BugTasksAndNominationsView',
+    'bugtask_heat_html',
     'BugsBugTaskSearchListingView',
     'NominationsReviewTableBatchNavigatorView',
     'TextualBugTaskSearchListingView',
@@ -49,6 +50,7 @@
 from simplejson import dumps
 import urllib
 from operator import attrgetter, itemgetter
+from math import floor
 
 from zope import component
 from zope.app.form import CustomWidgetFactory
@@ -1079,10 +1081,24 @@
     @property
     def bug_heat_html(self):
         """HTML representation of the bug heat."""
-        view = getMultiAdapter(
-            (self.context.bug, self.request),
-            name='+bug-heat')
-        return view()
+        return bugtask_heat_html(self.context)
+
+
+def bugtask_heat_html(bugtask):
+    """Render the HTML representing bug heat for a given bugask."""
+    max_heat = bugtask.target.max_heat
+    if max_heat == 0:
+        max_heat = 5000
+    heat_ratio = floor(
+        (bugtask.bug.heat / float(max_heat)) * 4)
+    html = '<span>'
+    for flame in range(1, 5):
+        if flame <= heat_ratio:
+            html += '<img src="/@@/flame-icon" />'
+        else:
+            html += '<img src="/@@/flame-bw-icon" />'
+    html += '</span>'
+    return html
 
 
 class BugTaskPortletView:

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2010-02-20 13:16:38 +0000
+++ lib/lp/bugs/browser/configure.zcml	2010-02-24 13:14:23 +0000
@@ -1044,11 +1044,6 @@
             name="+bug-portlet-subscribers-ids"
             class="lp.bugs.browser.bugsubscription.BugPortletSubcribersIds"
             permission="zope.Public"/>
-        <browser:page
-            for="lp.bugs.interfaces.bug.IBug"
-            class="lp.bugs.browser.bug.BugHeatView"
-            permission="zope.Public"
-            name="+bug-heat"/>
         <browser:navigation
             module="lp.bugs.browser.bug"
             classes="

=== modified file 'lib/lp/bugs/browser/tests/bug-heat-view.txt'
--- lib/lp/bugs/browser/tests/bug-heat-view.txt	2010-01-18 22:11:00 +0000
+++ lib/lp/bugs/browser/tests/bug-heat-view.txt	2010-02-24 13:14:23 +0000
@@ -4,12 +4,13 @@
 coloured is dependent on the value of the heat field. The view BugHeatView
 is used to render the flames.
 
-    >>> from lp.bugs.browser.bug import MAX_HEAT
+    >>> MAX_HEAT = 5000.0
     >>> from canonical.launchpad.ftests import login, logout
-    >>> from canonical.launchpad.webapp import canonical_url
     >>> from zope.security.proxy import removeSecurityProxy
     >>> from BeautifulSoup import BeautifulSoup
-    >>> def print_flames(html):
+    >>> from lp.bugs.browser.bugtask import bugtask_heat_html
+    >>> def print_flames(bugtask):
+    ...     html = bugtask_heat_html(bugtask)
     ...     soup = BeautifulSoup(html)
     ...     for img in soup.span.contents:
     ...         print img['src']
@@ -20,9 +21,9 @@
 a heat of half the maximum will result in a display of two coloured flames
 and two black-and-white flames.
 
+    >>> removeSecurityProxy(bug.default_bugtask.target).max_heat = MAX_HEAT
     >>> removeSecurityProxy(bug).heat = MAX_HEAT / 2
-    >>> bug_heat_view = create_initialized_view(bug, name='+bug-heat')
-    >>> print_flames(bug_heat_view())
+    >>> print_flames(bug.default_bugtask)
     /@@/flame-icon
     /@@/flame-icon
     /@@/flame-bw-icon
@@ -31,8 +32,7 @@
 A bug with a maximum heat will display all four flames coloured.
 
     >>> removeSecurityProxy(bug).heat = MAX_HEAT
-    >>> bug_heat_view = create_initialized_view(bug, name='+bug-heat')
-    >>> print_flames(bug_heat_view())
+    >>> print_flames(bug.default_bugtask)
     /@@/flame-icon
     /@@/flame-icon
     /@@/flame-icon
@@ -41,8 +41,7 @@
 A heat of less than a quarter of the maximum will display no coloured flames.
 
     >>> removeSecurityProxy(bug).heat = 0.1 * MAX_HEAT
-    >>> bug_heat_view = create_initialized_view(bug, name='+bug-heat')
-    >>> print_flames(bug_heat_view())
+    >>> print_flames(bug.default_bugtask)
     /@@/flame-bw-icon
     /@@/flame-bw-icon
     /@@/flame-bw-icon