Merge lp:~deryck/launchpad/sort-by-heat-as-default-77701 into lp:launchpad/db-devel

[Deryck Hodge]

[Deryck Hodge (deryck)]

This branch changes the default sort on bug listings to be heat
descending rather than importance descending. As a consequence of the
change, it fixes bug 77701. Affected tests have been updated and
default sort is well tested.

Cheers,
deryck

= 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/templates/bugtarget-macros-search.pt
  lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt
  lib/lp/bugs/stories/bugs/xx-front-page-search.txt
  lib/lp/bugs/browser/bugtask.py
  lib/lp/bugs/stories/bugtask-searches/xx-sort-orders.txt
  lib/lp/bugs/browser/tests/bugtask-search-views.txt
  lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt

[Graham Binns (gmb)]

I'm happy for this to land (though apparently Martin isn't, so that could be moot).

review: Approve

[Deryck Hodge (deryck)]

I'll hold on to the branch since it's complete and do a more extensive UI discussion and review with Martin A. next week to determine if we want to go forward with this approach.

Unmerged revisions

8919. By Deryck Hodge on 2010-01-22

Fix broken tests.

8918. By Deryck Hodge on 2010-01-22

Change the search input ordering to default to bug heat.

8917. By Deryck Hodge on 2010-01-22

Change default sort order from -importance to -heat.

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-01-19 20:21:55 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-01-22 20:25:23 +0000
@@ -293,7 +293,7 @@
         return order_by
     else:
         # No sort ordering specified, so use a reasonable default.
-        return ["-importance"]
+        return ['-heat']
 
 
 def get_default_search_params(user):

=== modified file 'lib/lp/bugs/browser/tests/bugtask-search-views.txt'
--- lib/lp/bugs/browser/tests/bugtask-search-views.txt	2009-11-27 14:34:31 +0000
+++ lib/lp/bugs/browser/tests/bugtask-search-views.txt	2010-01-22 20:25:23 +0000
@@ -35,9 +35,9 @@
     >>> open_bugtasks = list(distro_search_listingview.search().batch)
     >>> [(bugtask.bug.id, bugtask.status.name, bugtask.importance.name)
     ...  for bugtask in open_bugtasks]
-    [(3, 'NEW', 'UNKNOWN'),
-     (1, 'CONFIRMED', 'LOW'),
-     (2, 'CONFIRMED', 'LOW')]
+    [(1, 'CONFIRMED', 'LOW'),
+     (2, 'CONFIRMED', 'LOW'),
+     (3, 'NEW', 'UNKNOWN')]
 
 And the advanced form allows us to query for specific bug statuses.
 
@@ -301,10 +301,10 @@
     >>> open_bugtasks = list(mozilla_search_listingview.search().batch)
     >>> for bugtask in open_bugtasks:
     ...     print bugtask.bug.id, bugtask.product.name, bugtask.status.name
+    1 firefox NEW
+    4 firefox NEW
+    5 firefox NEW
     15 thunderbird NEW
-    5 firefox NEW
-    4 firefox NEW
-    1 firefox NEW
 
 And now we'll change the status of one of the bugtasks (we are still
 logged in from earlier):
@@ -327,7 +327,7 @@
     >>> invalid_bugtasks = list(mozilla_search_listingview.search().batch)
     >>> for bugtask in invalid_bugtasks:
     ...     print bugtask.bug.id, bugtask.product.name, bugtask.status.name
-    15 thunderbird INVALID
+    1 firefox INVALID
 
     >>> open_bugtasks[0].transitionToStatus(
     ...     previous_status, getUtility(ILaunchBag).user)

=== modified file 'lib/lp/bugs/stories/bugs/xx-front-page-search.txt'
--- lib/lp/bugs/stories/bugs/xx-front-page-search.txt	2009-09-23 13:26:26 +0000
+++ lib/lp/bugs/stories/bugs/xx-front-page-search.txt	2010-01-22 20:25:23 +0000
@@ -28,20 +28,13 @@
     >>> print anon_browser.title
     Search
     >>> print_bugtasks(anon_browser.contents)
-    3 Bug Title Test
-      mozilla-firefox (Debian) Unknown New
-    15 Nonsensical bugs are useless
-      Mozilla Thunderbird Unknown New
-    3 Bug Title Test
-      mozilla-firefox (Debian Woody) Medium New
-    3 Bug Title Test
-      mozilla-firefox (Debian Sarge) Medium New
-    7 A test bug
-      Evolution Medium New
-    10 another test bug
-      linux-source-2.6.15 (Ubuntu) Medium New
-    15 Nonsensical bugs are useless
-      Redfish Undecided New
+    3 Bug Title Test mozilla-firefox (Debian) Unknown New
+    3 Bug Title Test mozilla-firefox (Debian Woody) Medium New
+    3 Bug Title Test mozilla-firefox (Debian Sarge) Medium New
+    7 A test bug Evolution Medium New
+    10 another test bug linux-source-2.6.15 (Ubuntu) Medium New
+    15 Nonsensical bugs are useless Redfish Undecided New
+    15 Nonsensical bugs are useless Mozilla Thunderbird Unknown New
 
 Even if a product is specified in the bug target widget, all bug reports
 will be searched.

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt	2009-09-09 23:16:08 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt	2010-01-22 20:25:23 +0000
@@ -70,8 +70,8 @@
     >>> anon_browser.getControl(name='field.bug_reporter').value = 'name12'
     >>> anon_browser.getControl('Search', index=0).click()
     >>> print_bugtasks(anon_browser.contents)
+    2 Blackhole Trash folder mozilla-firefox (Debian) Low Confirmed
     5 Firefox install instructions should be complete Mozilla Firefox Critical New
-    2 Blackhole Trash folder mozilla-firefox (Debian) Low Confirmed
 
 and invalid searches don't OOPS:
 

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt	2010-01-19 20:45:38 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt	2010-01-22 20:25:23 +0000
@@ -7,18 +7,18 @@
     >>> from lp.bugs.tests.bug import print_bugtasks
     >>> user_browser.open("http://launchpad.dev/mozilla/+bugs")
     >>> print_bugtasks(user_browser.contents)
+    1 Firefox does not support SVG firefox Low New
+    4 Reflow problems with complex page layouts firefox Medium New
+    5 Firefox install instructions should be complete firefox Critical New
     15 Nonsensical bugs are useless thunderbird Unknown New
-    5 Firefox install instructions should be complete firefox Critical New
-    4 Reflow problems with complex page layouts firefox Medium New
-    1 Firefox does not support SVG firefox Low New
 
 Bug listings default to open bugtasks:
 
     >>> user_browser.open('http://launchpad.dev/debian/+bugs')
     >>> print_bugtasks(user_browser.contents)
+    1 Firefox does not support SVG mozilla-firefox Low Confirmed
+    2 Blackhole Trash folder mozilla-firefox Low Confirmed
     3 Bug Title Test mozilla-firefox Unknown New
-    1 Firefox does not support SVG mozilla-firefox Low Confirmed
-    2 Blackhole Trash folder mozilla-firefox Low Confirmed
 
 But you can make it show fixed ones to:
 
@@ -48,9 +48,9 @@
 
     >>> user_browser.open("http://launchpad.dev/firefox/+bugs")
     >>> print_bugtasks(user_browser.contents)
+    1 Firefox does not support SVG Low New
+    4 Reflow problems with complex page layouts Medium New
     5 Firefox install instructions should be complete Critical New
-    4 Reflow problems with complex page layouts Medium New
-    1 Firefox does not support SVG Low New
 
 View the distribution bug listing as Foo Bar, who's a maintainer.
 
@@ -74,10 +74,10 @@
 
     >>> anon_browser.open("""http://launchpad.dev/firefox/+bugs?field.searchtext=&field.status%3Alist=New&field.status%3Alist=Confirmed&field.status-empty-marker=1&field.importance-empty-marker=1&field.assignee=&field.unassigned.used=&field.omit_dupes=&field.milestone-empty-marker=1&search=Search""")
     >>> print_bugtasks(anon_browser.contents)
+    1 Firefox does not support SVG Low New
+    4 Reflow problems with complex page layouts Medium New
     5 Firefox install instructions should be complete Critical New
     6 Firefox crashes when Save As dialog for a nonexistent window is closed High New
-    4 Reflow problems with complex page layouts Medium New
-    1 Firefox does not support SVG Low New
 
 
 == Critical bugs ==
@@ -164,8 +164,8 @@
 
     >>> user_browser.open("http://launchpad.dev/firefox/+bugs?field.searchtext=install&search=Search&advanced=&milestone=1&status=10&status=20&assignee=all")
     >>> print_bugtasks(user_browser.contents)
+    1 Firefox does not support SVG Low New
     5 Firefox install instructions should be complete Critical New
-    1 Firefox does not support SVG Low New
 
 If we search for something and get no matches, it'll say so in a meaningful way
 instead of displaying an empty table.
@@ -206,12 +206,12 @@
 
     >>> browser.open('http://bugs.launchpad.dev/firefox/+bugs')
     >>> names_and_branches(browser.contents)
-    /firefox/+bug/5
-      Badge: branch
-    /firefox/+bug/4
-      Badge: branch
     /firefox/+bug/1
       Badge: blueprint
+    /firefox/+bug/4
+      Badge: branch
+    /firefox/+bug/5
+      Badge: branch
 
 Milestones are also presented as badges on bugs, and linked to the
 relevant listings:

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-sort-orders.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-sort-orders.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-sort-orders.txt	2010-01-22 20:25:23 +0000
@@ -9,12 +9,12 @@
 
     >>> from lp.bugs.tests.bug import print_bugtasks
     >>> print_bugtasks(anon_browser.contents)
+    1 Firefox does not support SVG
+    Low New
+    4 Reflow problems with complex page layouts
+    Medium New
     5 Firefox install instructions should be complete
     Critical New
-    4 Reflow problems with complex page layouts
-    Medium New
-    1 Firefox does not support SVG
-    Low New
 
 Newest:
 
@@ -35,12 +35,12 @@
 
     >>> anon_browser.open("http://launchpad.dev/debian/+bugs")
     >>> print_bugtasks(anon_browser.contents)
+    1 Firefox does not support SVG
+    mozilla-firefox Low Confirmed
+    2 Blackhole Trash folder
+    mozilla-firefox Low Confirmed
     3 Bug Title Test
     mozilla-firefox Unknown New
-    1 Firefox does not support SVG
-    mozilla-firefox Low Confirmed
-    2 Blackhole Trash folder
-    mozilla-firefox Low Confirmed
 
 By most recently changed:
 
@@ -111,12 +111,12 @@
     >>> anon_browser.open(
     ...     "http://launchpad.dev/debian/+source/mozilla-firefox/+bugs")
     >>> print_bugtasks(anon_browser.contents)
+    1 Firefox does not support SVG
+    Low Confirmed
+    2 Blackhole Trash folder
+    Low Confirmed
     3 Bug Title Test
     Unknown New
-    1 Firefox does not support SVG
-    Low Confirmed
-    2 Blackhole Trash folder
-    Low Confirmed
 
 Sort by importance:
 

=== modified file 'lib/lp/bugs/templates/bugtarget-macros-search.pt'
--- lib/lp/bugs/templates/bugtarget-macros-search.pt	2010-01-19 22:34:00 +0000
+++ lib/lp/bugs/templates/bugtarget-macros-search.pt	2010-01-22 20:25:23 +0000
@@ -9,7 +9,11 @@
     method.
   </tal:comment>
   <select name="orderby" id="orderby" size="1"
-          tal:define="orderby request/orderby|string:-importance">
+          tal:define="orderby request/orderby|string:-heat">
+    <option
+      value="-heat"
+      tal:attributes="selected python:orderby == '-heat'"
+    >by bug heat</option>
     <option
       value="-importance"
       tal:attributes="selected python:orderby == '-importance'"
@@ -55,10 +59,6 @@
       value="-users_affected_count"
       tal:attributes="selected python:orderby == '-users_affected_count'"
     >by number of users affected</option>
-    <option
-      value="-heat"
-      tal:attributes="selected python:orderby == '-heat'"
-    >by bug heat</option>
   </select>
 </metal:block>