Merge lp:~gmb/launchpad/stable-unfark into lp:launchpad

[Graham Binns]

An ordering issue in Person:+subscriptions has been fixed.

This branch fixes one of the current test failures in stable by fixing an ordering issue in the Person:+subscriptions page.

[Jonathan Lange (jml)]

Hey Graham,

Thanks for fixing this. If it were new code I'd hesitate to approve it – it looks like it's doing too many queries. As it is, I'm happy for this to land now.

jml

review: Approve

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-10-04 20:46:55 +0000
+++ lib/lp/registry/browser/person.py	2010-10-07 15:13:43 +0000
@@ -2368,7 +2368,13 @@
 
         for task in bug_tasks:
             if task.bug not in sub_bugs:
-                sub_bug_tasks.append(task)
+                # We order the bugtasks by date_last_updated but we
+                # always display the default task for the bug. This is
+                # to avoid ordering issues in tests and also prevents
+                # user confusion (because nothing is more confusing than
+                # your subscription targets changing seemingly at
+                # random).
+                sub_bug_tasks.append(task.bug.default_bugtask)
                 sub_bugs.append(task.bug)
         return BatchNavigator(sub_bug_tasks, self.request)
 

=== modified file 'lib/lp/registry/stories/person/xx-person-subscriptions.txt'
--- lib/lp/registry/stories/person/xx-person-subscriptions.txt	2010-10-05 16:17:07 +0000
+++ lib/lp/registry/stories/person/xx-person-subscriptions.txt	2010-10-07 15:13:43 +0000
@@ -110,7 +110,7 @@
     In
     1
     Firefox does not support SVG
-    mozilla-firefox (Ubuntu)
+    Mozilla Firefox
 
 Sample Person now chooses to unsubscribe HWDB team from bug 1.