Merge lp:~intellectronica/launchpad/sort-by-patch-age into lp:launchpad

[Eleanor Berger]

[Eleanor Berger (intellectronica)]

This branch makes it possible to sort the patch report by patch age, and makes this the default sort order. It also fixes a bug with the validation, where UnexpectedFormData wasn't imported, and adds a test that it works. This branch depends on ~kfogel/launchpad/patches-view-mega-integration - the diff to review is at http://pastebin.ubuntu.com/368253/

[Henning Eggers (henninge)]

Very nice, thanks for adding this feature.

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2010-02-03 15:45:31 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2010-02-03 15:45:34 +0000
@@ -62,7 +62,8 @@
     ITemporaryStorageManager)
 from canonical.launchpad.webapp import urlappend
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
-from canonical.launchpad.webapp.interfaces import ILaunchBag, NotFoundError
+from canonical.launchpad.webapp.interfaces import (
+    ILaunchBag, NotFoundError, UnexpectedFormData)
 from lp.bugs.interfaces.bug import (
     CreateBugParams, IBugAddForm, IProjectBugAddForm)
 from lp.bugs.interfaces.malone import IMaloneApplication
@@ -1406,10 +1407,9 @@
         # Zope form instead of validating the values by hand in the
         # code.  Doing it the Zope form way would specify rendering
         # and validation from the same enum, and thus observe DRY.
-        orderby = self.request.get("orderby")
-        if (orderby is not None and
-            orderby not in ["-importance", "status", "targetname",
-                            "datecreated", "-datecreated"]):
+        orderby = self.request.get("orderby", "-latest_patch_uploaded")
+        if orderby not in ["-latest_patch_uploaded", "-importance", "status",
+                           "targetname", "datecreated", "-datecreated"]:
             raise UnexpectedFormData(
                 "Unexpected value for field 'orderby': '%s'" % orderby)
         return BatchNavigator(

=== modified file 'lib/lp/bugs/stories/patches-view/patches-view.txt'
--- lib/lp/bugs/stories/patches-view/patches-view.txt	2010-02-03 15:45:31 +0000
+++ lib/lp/bugs/stories/patches-view/patches-view.txt	2010-02-03 15:45:34 +0000
@@ -126,22 +126,23 @@
     ...     description="description of patch f", bug=bug_c, is_patch=True)
     <BugAttachment at...
 
-...the youngest patch on each bug is visible is the patch report.
+...the youngest patch on each bug is visible in the patch report.
 
     >>> anon_browser.open('http://bugs.launchpad.dev/patchy-product-1/+patches')
     >>> show_patches_view(anon_browser.contents)
     Bug                                 Importance   Status    Patch Age
+    Bug #18: bug_c title                  Wishlist  Fix Committed ...second...
+    From: Patchy Person
+    Link: patch_f.diff description of patch f
     Bug #17: bug_b title                  Critical    Confirmed ...second...
     From: Patchy Person
     Link: patch_c.diff description of patch c
-    Bug #18: bug_c title                  Wishlist  Fix Committed ...second...
-    From: Patchy Person
-    Link: patch_f.diff description of patch f
     Bug #16: bug_a title                  Undecided     New     ...second...
     From: Patchy Person
     Link: patch_a.diff description of patch a
 
-We can sort patches by importance and status.
+The default sort order is by patch age. We can sort patches by
+importance and status.
 
     >>> anon_browser.getControl(name="orderby").value = ['-importance']
     >>> anon_browser.getControl("sort").click()
@@ -175,6 +176,14 @@
     From: Patchy Person
     Link: patch_f.diff description of patch f
 
+But we can't sort by things that aren't validated by the view.
+
+    >>> anon_browser.open('http://bugs.launchpad.dev/patchy-product-1/+patches?orderby=star-sign')
+    Traceback (most recent call last):
+    ...
+    UnexpectedFormData: Unexpected value for field 'orderby': 'star-sign'
+
+
 Bugs in a product series show up in the patches view for that series.
 
     >>> from zope.component import getUtility
@@ -291,14 +300,14 @@
     Bug #18: bug_c title        High       Triaged   warty    ...second...
     From: Patchy Person
     Link: patch_f.diff description of patch f
+    Bug #17: bug_b title      Undecided      New     warty    ...second...
+    From: Patchy Person
+    Link: patch_c.diff
+    description of patch c
     Bug #16: bug_a title      Undecided      New     warty    ...second...
     From: Patchy Person
     Link: patch_a.diff
     description of patch a
-    Bug #17: bug_b title      Undecided      New     warty    ...second...
-    From: Patchy Person
-    Link: patch_c.diff
-    description of patch c
 
 Patches View by Source Package
 ------------------------------
@@ -334,24 +343,20 @@
     ...     'http://bugs.launchpad.dev/~%s/+patches' % (
     ...         patch_submitter.name,))
     >>> show_patches_view(user_browser.contents)
-    Bug                     Importance  Status         Patch Age
-    Bug #17: bug_b title    Critical    Confirmed      ...second...
-    From: Patchy Person
-    Link: patch_c.diff
-    description of patch c
-    Bug #18: bug_c title    High        Triaged        ...second...
-    From: Patchy Person
-    Link: patch_f.diff
-    description of patch f
-    Bug #18: bug_c title    High        Triaged        ...second...
-    From: Patchy Person
-    Link: patch_f.diff
-    description of patch f
-    Bug #16: bug_a title    Medium      Fix Released   ...second...
-    From: Patchy Person
-    Link: patch_a.diff
-    description of patch a
-    Bug #18: bug_c title    Wishlist    Fix Committed  ...second...
-    From: Patchy Person
-    Link: patch_f.diff
-    description of patch f
+    Bug                       Importance   Status         Patch Age
+    Bug #18: bug_c title      Wishlist     Fix Committed  ...second...
+    From: Patchy Person
+    Link: patch_f.diff description of patch f
+    Bug #18: bug_c title      Wishlist     Fix Committed  ...second...
+    From: Patchy Person
+    Link: patch_f.diff description of patch f
+    Bug #18: bug_c title      High         Triaged        ...second...
+    From: Patchy Person
+    Link: patch_f.diff description of patch f
+    Bug #18: bug_c title      Undecided    New            ...second...
+    From: Patchy Person
+    Link: patch_f.diff description of patch f
+    Bug #18: bug_c title      High         Triaged        ...second...
+    From: Patchy Person
+    Link: patch_f.diff description of patch f
+

=== modified file 'lib/lp/bugs/templates/bugtarget-patches.pt'
--- lib/lp/bugs/templates/bugtarget-patches.pt	2010-02-03 15:45:31 +0000
+++ lib/lp/bugs/templates/bugtarget-patches.pt	2010-02-03 15:45:34 +0000
@@ -32,7 +32,11 @@
 
     Order&nbsp;by:&nbsp;<select
                     name="orderby" id="orderby" size="1"
-                    tal:define="orderby request/orderby|string:-importance">
+                    tal:define="orderby request/orderby|string:-latest_patch_uploaded">
+      <option
+        value="-latest_patch_uploaded"
+        tal:attributes="selected python:orderby == '-latest_patch_uploaded'"
+      >patch age</option>
       <option
         value="-importance"
         tal:attributes="selected python:orderby == '-importance'"