Merge lp:~adeuring/launchpad/bug-528374 into lp:launchpad/db-devel

[Abel Deuring]

[Abel Deuring (adeuring)]

This branch fixes bug 528374: Flames misplaced on bug report page

It was caused by the removal of a <span> that enclosed the <img> tags of heat icons. I have not enough CSS-fu to explain why this <span> necessary...

As a drive-by fix, I ensured that a case like "7 out of 4 heat flames" (as can be currently seen on https://bugs.edge.launchpad.net/ubuntu/+bugs?orderby=-heat can no longer occur and that a max_heat value of 1 does not cause a divide-by-zero error.

test: ./bin/test -t bug-heat-view.txt

To check the position of haet icon: Open https://bugs.launchpad.dev/firefox/+bug/1 ; the icons should appear right of "Bug #1 reported by Sample Person on 2004-01-01"

no lint

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-02-27 20:20:03 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-02-28 10:04:17 +0000
@@ -1092,10 +1092,13 @@
     max_bug_heat = float(max_bug_heat)
     if heat / max_bug_heat < 0.33333:
         return 0
-    if heat / max_bug_heat < 0.66666:
+    if heat / max_bug_heat < 0.66666 or max_bug_heat < 2:
         return int(floor((heat / max_bug_heat) * 4))
     else:
-        return int(floor((log(heat) / log(max_bug_heat)) * 4))
+        heat_index = int(floor((log(heat) / log(max_bug_heat)) * 4))
+        # ensure that we never return a value > 4, even if
+        # max_bug_heat is outdated.
+        return min(heat_index, 4)
 
 
 def bugtask_heat_html(bugtask):
@@ -1105,8 +1108,9 @@
         max_bug_heat = 5000
     heat_ratio = calculate_heat_display(bugtask.bug.heat, max_bug_heat)
     html = (
-        '<img src="/@@/bug-heat-%(ratio)i.png" '
+        '<span><img src="/@@/bug-heat-%(ratio)i.png" '
         'alt="%(ratio)i out of 4 heat flames"  title="Heat: %(heat)i" />'
+        '</span>'
         % {'ratio': heat_ratio, 'heat': bugtask.bug.heat})
     return html
 
 
=== modified file 'lib/lp/bugs/browser/tests/bug-heat-view.txt'
--- lib/lp/bugs/browser/tests/bug-heat-view.txt	2010-02-26 09:54:20 +0000
+++ lib/lp/bugs/browser/tests/bug-heat-view.txt	2010-02-28 10:04:17 +0000
@@ -12,7 +12,7 @@
     >>> def print_flames(bugtask):
     ...     html = bugtask_heat_html(bugtask)
     ...     soup = BeautifulSoup(html)
-    ...     for img in soup.contents:
+    ...     for img in soup.span.contents:
     ...         print img['src']
     ...         print img['alt']
     ...         print img['title']
@@ -81,3 +81,14 @@
     >>> print calculate_heat_display(800.0, 1000.0)
     3
 
+A max heat value of 1 works too, because we don't divide by
+log(max_heat) in this case.
+
+    >>> print calculate_heat_display(1, 1)
+    4
+
+Even if the max heat value is smaller than the heat value itself,
+calculate_heat_display() does not return a value greater than 4.
+
+    >>> print calculate_heat_display(2000, 1000)
+    4