Merge lp:~wgrant/launchpad/fix-team-unsubscription-bug-415229 into lp:launchpad

[William Grant]

[William Grant (wgrant)]

= Summary =

Links in the subscribers portlet were previously just paths (/~someperson), but now include the mainsite domain (https://launchpad.dev/~someperson). The inline unsubscription JS assumes the old style, so is broken.

Only the last revision is really in this branch; the others are in lp:~wgrant/launchpad/fix-ajax-subscription-bug-41516 which is approved for landing.

== Proposed fix ==

The URL is retrieved with get_user_uri_from_icon, so my fix strips the domain off there. This returns the behaviour of the function to the original, so the rest of the JS works as before.

== Pre-implementation notes ==

BjornT agreed that the correct fix was to strip the domain off, and suggested that it be done inside get_user_uri_from_icon.

== Implementation details ==

See above.

== Tests ==

There's just a somewhat flaky Windmill test:

 $ ./bin/lp-windmill -e test=lib/lp/bugs/windmill/tests/test_bugs/test_bug_inline_subscriber.py firefox http://bugs.launchpad.dev:8085

== Demo and Q/A ==

To Q/A:

 * Log on as any user.
 * Navigate to a bug.
 * Subscribe a team of which you are a member.
 * Without refreshing, click on the unsubscribe link next to it.
 * Verify that you were unsubscribed via AJAX.
 * Repeat the above, but refreshing before clicking the unsubscribe link.

[Graham Binns (gmb)]

Hi William,

This all looks good. r=me.

review: Approve (code js)

=== modified file 'lib/canonical/launchpad/doc/tales.txt'
--- lib/canonical/launchpad/doc/tales.txt	2009-08-13 21:32:59 +0000
+++ lib/canonical/launchpad/doc/tales.txt	2009-08-18 05:00:54 +0000
@@ -289,6 +289,30 @@
     >>> login(ANONYMOUS)
 
 
+The fmt: namespace to get a web service URL
+-------------------------------------------
+
+The `fmt:api_url` expression gives you the absolute API path to an object.
+This path is everything after the web service version number.
+
+    >>> login(ANONYMOUS,
+    ...     LaunchpadTestRequest(SERVER_URL='http://bugs.launchpad.net'))
+
+    >>> bob = factory.makePerson(name='bob')
+    >>> print test_tales("person/fmt:api_url", person=bob)
+    /~bob
+
+    >>> freewidget = factory.makeProduct(name='freewidget')
+    >>> print test_tales("product/fmt:api_url", product=freewidget)
+    /freewidget
+
+    >>> debuntu = factory.makeProduct(name='debuntu')
+    >>> print test_tales("distro/fmt:api_url", distro=debuntu)
+    /debuntu
+
+    >>> login(ANONYMOUS)
+
+
 The fmt: namespace to get links
 -------------------------------
 
@@ -456,20 +480,22 @@
 Branch subscriptions show the person and branch name.  For users without
 adequate permissions, a link is not generated.
 
-    >>> branch = factory.makeAnyBranch(title='My Branch')
-    >>> person = factory.makePerson(displayname='My Person')
+    >>> branch = factory.makeProductBranch(
+    ...     owner=eric, product=fooix, name='my-branch', title='My Branch')
+    >>> michael = factory.makePerson(
+    ...     name='michael', displayname='Michael the Viking')
     >>> subscription = factory.makeBranchSubscription(
-    ...     branch=branch, person=person)
+    ...     branch=branch, person=michael)
     >>> test_tales("subscription/fmt:link", subscription=subscription)
-    u'Subscription of My Person to
-      lp://dev/~person-name17/product-name12/branch19'
+    u'Subscription of Michael the Viking to
+      lp://dev/~eric/fooix/my-branch'
 
 But if we log in as the subscriber, a link is presented.
 
     >>> login_person(subscription.person)
     >>> test_tales("subscription/fmt:link", subscription=subscription)
-    u'<a href="http://.../+subscription/person-name21">Subscription
-      of My Person to lp://dev/~person-name17/product-name12/branch19</a>'
+    u'<a href="http://.../+subscription/michael">Subscription
+      of Michael the Viking to lp://dev/~eric/fooix/my-branch</a>'
 
 Merge proposals also have a link formatter, which displays branch
 titles:

=== modified file 'lib/canonical/launchpad/javascript/bugs/bugtask-index.js'
--- lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-08-10 12:12:00 +0000
+++ lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2009-08-18 09:33:20 +0000
@@ -664,6 +664,14 @@
     // and cross-browser issues, using the YUI query syntax is
     // safer here.
     var user_uri = parent_div.query('a').getAttribute('href');
+
+    // Strip the domain off. We just want a path.
+    var host_start = user_uri.indexOf('//');
+    if (host_start != -1) {
+        var host_end = user_uri.indexOf('/', host_start+2);
+        return user_uri.substring(host_end, user_uri.length);
+    }
+
     return user_uri;
 }
 

=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2009-08-14 12:56:19 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2009-08-18 05:03:00 +0000
@@ -455,7 +455,10 @@
         version number. It's the same as 'url', but without any view
         name.
         """
-        return self.url()
+
+        # Some classes override the rootsite. We always want a path-only
+        # URL, so we override it to nothing.
+        return self.url(rootsite=None)
 
     def traverse(self, name, furtherPath):
         if name.startswith('link:') or name.startswith('url:'):