Merge lp:~wallyworld/launchpad/admins-can-unsubscribe-bugs-2 into lp:launchpad

[Ian Booth]

[r=danilo][bug=633,134577] Allow a person to unsubscribe from a bug those people/teams who they have subscribed.

This branch provides the client side code to allow someone to unsubscribe from a bug a person/team they have subscribed. A previous branch implemented the functionality on the model. This branch uses that to provide the unsubscribe link when appropriate.

== Implementation ==

The BugPortletSubscribersWithDetails view was changed to call BugSubscription.canBeUnsubscribedByUser() to see if the logged in user can unsubscribe someone.
The subscribers_list javascript was changed to always add the unsubscribe link when a subscription request is completed successfully.

== Demo and QA ==

Subscribe someone to a bug - the unsubscribe icon should be rendered in the subscription list to allow you to unsubscribe them.

== Tests ==

Added tests to BugPortletSubscribersWithDetailsTests:
test_data_subscription_lp_admin
test_data_person_subscription_subscriber

Modify the test_subscribeSomeoneElse_success test in test_subscribers_list.js test

== Lint ==

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/browser/bugsubscription.py
  lib/lp/bugs/browser/tests/test_bugsubscription_views.py
  lib/lp/bugs/javascript/subscribers_list.js
  lib/lp/bugs/javascript/tests/test_subscribers_list.js

[Данило Шеган (danilo)]

Looks great, Ian, thanks for fixing this!

review: Approve

=== removed directory 'lib/canonical/launchpad/windmill'
=== removed directory 'lib/canonical/launchpad/windmill/jstests'
=== removed file 'lib/canonical/launchpad/windmill/jstests/initialize.js'
--- lib/canonical/launchpad/windmill/jstests/initialize.js	2010-11-16 18:54:59 +0000
+++ lib/canonical/launchpad/windmill/jstests/initialize.js	1970-01-01 00:00:00 +0000
@@ -1,164 +0,0 @@
-/* 
-Copyright 2009 Canonical Ltd.  This software is licensed under the
-GNU Affero General Public License version 3 (see the file LICENSE).
-
-Contains the JS fixtures we use to test AJAX call in windmill.
-
-Since AJAX calls will complete asynchronously, we need to use a 
-synchronisation mechanism.
- 
- */
-
-
-/* A synchronized test.
- * @param name The name of the test, the DOM node used for synchronization
- *      will use that name.
- *
- * @param body This is a list of functions or strings or windmill action
- *      object. That makes this test body.
- *      
- * @param debug (Optional) If this is set to true, tracing information 
- *      will be logged on the Firebug console.
- */
-function SynchronizedTest(name, body, debug) {
-    this.name = name;
-    this.debug = !!debug;
-    this.synced = false;
-
-    /* Create the test body. */
-    this.test_body = [];
-    this.add_windmill_actions(this.test_body, body);
-
-    /*
-     * The tear down is also as an array, so that many cleanup
-     * actions can be tacked to it using add_cleanups()
-     */
-    // Windmill doesn't like empty array teardown. So we define it as an
-    // empty object, which gets replaced by an array when add_cleanups is
-    // called.
-    //this.teardown = [];
-    this.teardown = function () {};
-}
-
-
-/* The YUI instance used by SynchronizedTest. */
-SynchronizedTest.prototype.Y = YUI({
-    bootstrap: false,
-    fetchCSS: false,
-    combine: false,
-    timeout: 50
-    }).use('dump');
-
-/* Create the synchronization node, that should make the wait() caller
- * return.
- *
- * @param result This object will be available from the result attribute.
- *      This can be used to provide information passed to the callback 
- *      and that we want to make assertion on.
- */
-SynchronizedTest.prototype.sync = function (result) {
-    this.log('sync() called with ' + this.Y.dump(result));
-    this.result = result;
-    this.synced = true;
-};
-
-
-/* Convert a sequence of test items and adds them to a windmill array 
- * test specification.
- *
- * That method is used by the constructor and add_cleanups method.
- */
-SynchronizedTest.prototype.add_windmill_actions = function (list, items) {
-    var test = this;
-
-    /* Windmill invokes all test functions without setting the this parameter.
-     * So we create wrapper that will pass it to our functions.
-     */
-    function create_test_wrapper (func) {
-        return function () { func(test); };
-    }
-
-    for (var i=0; i< items.length; i++) {
-        var test_item = items[i];
-        var yui_lang = this.Y.Lang;
-        if (yui_lang.isFunction(test_item)) {
-            //Create a wrapper that passes the test as first parameter.
-            list.push(create_test_wrapper(test_item));
-        } else if (yui_lang.isString(test_item)) {
-            //This calls a method on the test. And sticks the result
-            //in the test body. Common use case is to use 'wait_action' to
-            //add a windmill wait action for the synchronizing condition.
-            var action = test[test_item].call(test);
-            list.push(action);
-        } else if (yui_lang.isObject(test_item)) {
-            //We expect this to be a Windmill action.
-            list.push(test_item);
-        } else {
-            throw new Error(
-                'Unknown test predicate: ' + this.Y.dump(test_item));
-        }
-    }
-};
-
-/* Add functions/actions to the "teardown" test.
- *
- * @param cleanups An array of functions, or strings or objects representing
- *      windmill actions. (Like in the test body parameter.)
- */
-SynchronizedTest.prototype.add_cleanups = function (cleanups) {
-    if (this.Y.Lang.isFunction(this.teardown)) {
-        this.teardown = [];
-    }
-    this.add_windmill_actions(this.teardown, cleanups);
-};
-
-/* Return a windmill action that can be used to wait for 
- * the synchronization to happen.
- */
-SynchronizedTest.prototype.wait_action = function () {
-    var test = this;
-    return {
-        method: "waits.forJS",
-        params: {
-            //The function waits for the synced attribute to be set to true;
-            //and then resets it so that next synchronization action work.
-            js: function () {
-                if (test.synced) {
-                    test.synced = false;
-                    return true;
-                } else {
-                    return false;
-                }
-            },
-            timeout: 8000
-        }
-    };
-};
-
-
-/* Output a log message when debug is turned on.
- */
-SynchronizedTest.prototype.log = function (message) {
-    if (this.debug && console) {
-        console.log(this.name + ': ' + message);
-    }
-};
-
-
-/* Return a configuration object that can be used as a on
- * specification to YUI.io.
- *
- * It basically will call the test sync method, and save the
- * name of the handler called, and the arguments list.
- */
-SynchronizedTest.prototype.create_yui_sync_on = function () {
-    var test = this;
-    return {
-        success: function () {
-            test.sync({callback: 'success', args: test.Y.Array(arguments)});
-        },
-        failure: function () {
-            test.sync({callback: 'failure', args: test.Y.Array(arguments)});
-        }
-    };
-};

=== removed file 'lib/canonical/launchpad/windmill/jstests/launchpad_ajax.js'
--- lib/canonical/launchpad/windmill/jstests/launchpad_ajax.js	2011-02-24 22:43:20 +0000
+++ lib/canonical/launchpad/windmill/jstests/launchpad_ajax.js	1970-01-01 00:00:00 +0000
@@ -1,652 +0,0 @@
-// Unit testing framework for the Launchpad AJAX test suite.
-var client = new LP.client.Launchpad();
-
-windmill.jsTest.require('login.js');
-
-
-// Test access to prepopulated data.
-test_prepopulated_data_anonymous = new SynchronizedTest(
-    'test_prepopulated_data_anonymous', [
-    {"params": {"url": "/firefox/+bug/1"}, "method": "open"},
-    {"params": {}, "method": "waits.forPageLoad"},
-    // Wait until one of the last element on the page is available.
-    {"params": {"xpath": "//div[@id='globalfooter']"},
-     "method": "waits.forElement"},
-    function (test) {
-        jum.assertUndefined(LP.links.me);
-        jum.assertUndefined(LP.cache.context);
-    }
-    ]);
-
-test_logged_in_as_foo_bar.test_prepopulated_data = new SynchronizedTest(
-    'test_prepopulated_data', [
-    {"params": {"url": "/firefox/+bug/1"}, "method": "open"},
-    {"params": {}, "method": "waits.forPageLoad"},
-    // Wait until one of the last element on the page is available.
-    {"params": {"xpath": "//div[@id='globalfooter']"},
-     "method": "waits.forElement"},
-    function (test) {
-        // If the user is logged in, the link to their user account
-        // will be in the link cache.
-        jum.assertEquals(LP.links.me, '/~name16');
-
-        // If the view has a context, the context will be in the object
-        // cache.
-        jum.assertNotUndefined(LP.cache.context);
-        var context = LP.cache.context;
-        jum.assertNotEquals(context.self_link.indexOf(
-                            "/api/devel/firefox/+bug/1"), -1);
-        jum.assertNotEquals(context.resource_type_link.indexOf(
-                            "/api/devel/#bug_task"), -1);
-        jum.assertNotEquals(context.owner_link.indexOf(
-                            "/api/devel/~name12"), -1);
-        jum.assertNotEquals(context.related_tasks_collection_link.indexOf(
-                            "/api/devel/firefox/+bug/1/related_tasks"), -1);
-
-        // Specific views may add additional objects to the object cache
-        // or links to the link cache.
-        var bug = LP.cache.bug;
-        jum.assertNotUndefined(LP.cache.bug);
-        jum.assertNotEquals(bug.self_link.indexOf("/api/devel/bugs/1"), -1);
-    }
-    ]);
-
-// Test that making a web service call doesn't modify the callback
-// methods you pass in.
-var test_callback_safety = function() {
-    var success_callback = function() {};
-    var config = {on: {success: success_callback}};
-
-    // Test a GET.
-    client.get("/people", config);
-    jum.assertTrue(success_callback === config.on.success);
-
-    // Test a named POST.
-    name = "callback-safety-test" + new Date().getTime();
-    config.parameters = {display_name: 'My new team', name: name};
-    client.named_post("/people", "newTeam", config);
-    jum.assertTrue(success_callback === config.on.success);
-};
-
-
-var test_normalize_uri = function() {
-    var normalize = LP.client.normalize_uri;
-    jum.assertEquals(normalize("http://www.example.com/api/devel/foo"),
-                     "/api/devel/foo");
-    jum.assertEquals(normalize("http://www.example.com/foo/bar"), "/foo/bar");
-    jum.assertEquals(normalize("/foo/bar"), "/api/devel/foo/bar");
-    jum.assertEquals(normalize("/api/devel/foo/bar"), "/api/devel/foo/bar");
-    jum.assertEquals(normalize("foo/bar"), "/api/devel/foo/bar");
-    jum.assertEquals(normalize("api/devel/foo/bar"), "/api/devel/foo/bar");
-};
-
-var test_append_qs = function() {
-    var qs = "";
-    qs = LP.client.append_qs(qs, "Pöllä", "Perelló");
-    jum.assertEquals("P%C3%B6ll%C3%A4=Perell%C3%B3", qs);
-};
-
-var test_field_uri = function() {
-    jum.assertEquals(LP.client.get_field_uri("http://www.example.com/api/devel/foo", "field"),
-                     "/api/devel/foo/field");
-    jum.assertEquals(LP.client.get_field_uri("/no/slash", "field"),
-                     "/api/devel/no/slash/field");
-    jum.assertEquals(LP.client.get_field_uri("/has/slash/", "field"),
-                     "/api/devel/has/slash/field");
-};
-
-// Test that retrieving a non-existent resource uses the failure handler.
-var test_no_such_url = new SynchronizedTest('test_no_such_url', [
-    function (test) {
-        client.get("no-such-url", {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('failure', test.result.callback);
-    }
-    ]);
-
-
-//Check that retrieving the root by relative URL returns the root entry.
-var test_relative_url = new SynchronizedTest('test_relative_url', [
-    function (test) {
-        client.get("", {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var launchpad = test.result.args[0];
-        jum.assertTrue(launchpad instanceof LP.client.Root);
-        jum.assertNotNull(
-            launchpad.people_collection_link.match(/people$/));
-    }
-    ]);
-
-
-//Check that retrieving the root by absolute URL returns the root entry.
-var test_absolute_url = new SynchronizedTest('test_absolute_url', [
-    function (test) {
-        client.get("", {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var launchpad = test.result.args[0];
-        jum.assertTrue(launchpad instanceof LP.client.Root);
-        jum.assertNotNull(
-            launchpad.people_collection_link.match(/people$/));
-    }
-    ]);
-
-
-// Check that collection resources are paginated.
-var test_pagination_collection = new SynchronizedTest(
-    'test_pagination_collection', [
-    function (test) {
-        client.get("/people", {on: test.create_yui_sync_on(),
-                               start: 2, size: 1});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var people = test.result.args[0];
-        jum.assertEquals(2, people.start);
-        jum.assertEquals(1, people.entries.length);
-    }
-    ]);
-
-
-// Check invoking a read-only name operation on a resource URI.
-// Make sure it's possible to invoke named operations on URIs.
-var test_named_get = new SynchronizedTest('test_named_get', [
-    function (test) {
-        client.named_get(
-            "people/", "find", {on: test.create_yui_sync_on(),
-                                parameters: {text:"salgado"}});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var collection = test.result.args[0];
-        jum.assertTrue(collection instanceof LP.client.Collection);
-        jum.assertEquals(1, collection.total_size);
-    }
-    ]);
-
-
-
-var test_named_get_returning_json = new SynchronizedTest(
-    'test_named_get_returning_json', [
-    // Make sure a named GET that returns a JSON data structure works.
-    function (test) {
-        client.named_get("ubuntu/+archive/primary", "getBuildCounters",
-                         {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var structure = test.result.args[0];
-        jum.assertEquals(structure.failed, 5);
-    }
-    ]);
-
-
-// Check the invocation of a named POST operation.
-test_logged_in_as_foo_bar.test_named_post = new SynchronizedTest(
-    'test_named_post', [
-    function (test) {
-        test.bugtask_uri = '/redfish/+bug/15';
-        client.named_post(
-                          test.bugtask_uri, 'transitionToStatus',
-                          {on: test.create_yui_sync_on(),
-                           parameters: {status: 'Confirmed'}});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        test.add_cleanups([
-            function (test) {
-                client.named_post(
-                    test.bugtask_uri, 'transitionToStatus',
-                    {on: test.create_yui_sync_on(),
-                     parameters: {'status': 'New'}});
-            },
-            'wait_action']);
-        // Get the bugtask and make sure its status has changed.
-        client.get(test.bugtask_uri, {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function(test) {
-        jum.assertEquals('success', test.result.callback);
-        var bugtask = test.result.args[0];
-        jum.assertEquals(bugtask.get('status'), 'Confirmed');
-    }
-    ]);
-
-//Test that follow_link return the resource at the end of the link.
-// Retrieve the launchpad root and check the people link is a collection.
-var test_follow_link = new SynchronizedTest('test_follow_link', [
-    function (test) {
-        client.get("", {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var root_object = test.result.args[0];
-        root_object.follow_link('people', {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var people = test.result.args[0];
-        jum.assertTrue(people instanceof LP.client.Collection);
-        jum.assertEquals(4, people.total_size);
-    }
-    ]);
-
-//Test that follow_link follows through redirect.
-// Retrieve the launchpad root and check the people
-test_logged_in_as_foo_bar.test_follow_link_through_redirect =
-    new SynchronizedTest(
-        'test_follow_link_through_redirect', [
-        function (test) {
-            client.get("", {on: test.create_yui_sync_on()});
-        },
-        'wait_action',
-        function (test) {
-            jum.assertEquals('success', test.result.callback);
-            var root_object = test.result.args[0];
-            root_object.follow_link('me', {on: test.create_yui_sync_on()});
-        },
-        'wait_action',
-        function (test) {
-            jum.assertEquals('success', test.result.callback);
-            var me = test.result.args[0];
-            jum.assertTrue(me instanceof LP.client.Entry);
-            jum.assertEquals('name16', me.get('name'));
-        }
-        ]);
-
-
-//Test that retrieving an entry resource yield an Entry object.
-var test_entry_get = new SynchronizedTest('test_entry_get', [
-    function (test) {
-        client.get('~salgado', {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var salgado = test.result.args[0];
-        jum.assertTrue(salgado instanceof LP.client.Entry);
-        jum.assertEquals("salgado", salgado.get('name'));
-    }
-    ]);
-
-// Test that retrieving an HTML representation of an entry yields an
-// HTML snippet.
-var test_entry_html_get = new SynchronizedTest('test_entry_html_get', [
-    function (test) {
-        client.get('~salgado', {on: test.create_yui_sync_on(),
-                                accept: LP.client.XHTML});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var salgado_html = test.result.args[0];
-        jum.assertNotEquals(salgado_html.indexOf("<dl"), -1);
-     }
-     ]);
-
-
-// Test that it's possible to request an HTML representation of
-// an object when updating it.
-test_logged_in_as_foo_bar.test_html_entry_lp_save = new SynchronizedTest(
-    'test_entry_lp_save', [
-    function (test) {
-        client.get('~salgado', {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var salgado = test.result.args[0];
-        salgado.lp_save({on: test.create_yui_sync_on(),
-                         accept: LP.client.XHTML});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var salgado_html = test.result.args[0];
-        jum.assertNotEquals(salgado_html.indexOf("<dl"), -1);
-
-        // Now test the patch() method directly.
-        client.patch('~salgado', {},
-                     {on: test.create_yui_sync_on(),
-                      accept: LP.client.XHTML});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var salgado_html = test.result.args[0];
-        jum.assertNotEquals(salgado_html.indexOf("<dl"), -1);
-
-         // Now test the patch() method on a field resource.
-         var field_uri = LP.client.get_field_uri('~salgado', 'display_name');
-         client.patch(field_uri, 'Guilherme Salgado 2',
-                      {on: test.create_yui_sync_on(),
-                       accept: LP.client.XHTML});
-     },
-     'wait_action',
-     function (test) {
-         var field_uri = LP.client.get_field_uri('~salgado', 'display_name');
-         jum.assertEquals('success', test.result.callback);
-         var salgado_name_html = test.result.args[0];
-         jum.assertEquals(salgado_name_html, "Guilherme Salgado 2");
-
-         // Now make sure patch() on a field resource works when we
-         // request a JSON representation in return.
-         field_uri = LP.client.get_field_uri('~salgado', 'display_name');
-         client.patch(field_uri, 'Guilherme Salgado',
-                      {on: test.create_yui_sync_on()});
-     },
-     'wait_action',
-     function (test) {
-         var field_uri = LP.client.get_field_uri('~salgado', 'display_name');
-         jum.assertEquals('success', test.result.callback);
-         var salgado_name_html = test.result.args[0];
-         jum.assertEquals(salgado_name_html, "Guilherme Salgado");
-     }
-]);
-
-//Test that modifying an entry and then calling lp_save() saves the
-//entry on the server.
-test_logged_in_as_foo_bar.test_entry_lp_save = new SynchronizedTest(
-    'test_entry_lp_save', [
-    function (test) {
-        client.get('~salgado', {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var salgado = test.result.args[0];
-        test.original_display_name = salgado.get('display_name');
-        salgado.set('display_name', '<b>A new display name</b>');
-        salgado.lp_save({on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        // Make sure that the save operation returned a new version of
-        // the object.
-        var new_salgado = test.result.args[0];
-        jum.assertEquals(new_salgado.get('display_name'),
-                         '<b>A new display name</b>');
-
-        test.add_cleanups([
-            function (test) {
-                client.get('~salgado', {on: test.create_yui_sync_on()});
-            },
-            'wait_action',
-            function (test) {
-                jum.assertEquals('success', test.result.callback);
-                var salgado = test.result.args[0];
-                salgado.set('display_name', test.original_display_name);
-                salgado.lp_save({on: test.create_yui_sync_on()});
-                jum.assertEquals(salgado.dirty_attributes.length, 0);
-            },
-            'wait_action']);
-        client.get('~salgado', {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var salgado = test.result.args[0];
-        jum.assertEquals('<b>A new display name</b>',
-                         salgado.get('display_name'));
-
-        // As long as we've got bad HTML in the display name, let's
-        // get an HTML representation and see whether the bad HTML was
-        // escaped.
-        client.get('~salgado', {on: test.create_yui_sync_on(),
-                                accept: LP.client.XHTML});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-
-        var salgado_html = test.result.args[0];
-        jum.assertNotEquals(salgado_html.indexOf("<dl"), -1);
-        jum.assertNotEquals(salgado_html.indexOf("&lt;b&gt;A new"), -1);
-
-        // Now test the patch() method directly.
-        client.patch('~salgado', {'display_name': 'A patched display name'},
-                     {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        client.get('~salgado', {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var salgado = test.result.args[0];
-        jum.assertEquals('A patched display name', salgado.get('display_name'));
-
-        // Test that a mismatched ETag results in a failed save.
-        salgado.set('http_etag', "Non-matching ETag.");
-        salgado.set('display_name', "This display name will not be set.");
-        salgado.lp_save({on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('failure', test.result.callback);
-        var xhr = test.result.args[1];
-        jum.assertEquals(xhr.status, 412);
-    }
-    ]);
-
-
-//Test retrieving a collection object.
-var test_collection = new SynchronizedTest('test_collection', [
-    function (test) {
-        client.get("people", {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var collection = test.result.args[0];
-        jum.assertTrue(collection instanceof LP.client.Collection);
-        jum.assertEquals(4, collection.total_size);
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-	var entries = test.result.args[0].entries,
-	    length = test.result.args[0].total_size,
-	    index;
-	for (index = 0 ; index < length ; index++) {
-            jum.assertTrue(entries[index] instanceof LP.client.Entry);
-	}
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-	var entry = test.result.args[0].entries[0];
-	jum.assertEquals('test', entry.display_name);
-	entry.set('display_name', "Set Display Name");
-	entry.lp_save({on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-	client.get('people', { on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-	var entry = test.result.args[0].entries[0];
-	jum.assertEquals('Set Display Name', entry.display_name);
-    }
-    ]);
-
-
-//Test the lp_slice() method on a collection.
-var test_collection_lp_slice = new SynchronizedTest(
-    'test_collection_lp_slice', [
-    function (test) {
-        client.get("people", {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var collection = test.result.args[0];
-        collection.lp_slice(test.create_yui_sync_on(), 2, 1);
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var slice = test.result.args[0];
-        jum.assertEquals(2, slice.start);
-        jum.assertEquals(1, slice.entries.length);
-    }
-    ]);
-
-
-//Test invoking a named GET on a collection.
-var test_collection_named_get = new SynchronizedTest(
-    'test_collection_named_get', [
-    function (test) {
-        client.get("people", {on: test.create_yui_sync_on() });
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var collection = test.result.args[0];
-        collection.named_get(
-          'find', {on: test.create_yui_sync_on(),
-                  parameters: {text: 'salgado'}});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var collection = test.result.args[0];
-        jum.assertTrue(collection instanceof LP.client.Collection);
-        jum.assertEquals(1, collection.total_size);
-    }
-    ]);
-
-
-//Test named POST on a collection, and object creation.
-test_logged_in_as_foo_bar.test_collection_named_post = new SynchronizedTest(
-    'test_collection_named_post', [
-    function(test) {
-        client.get("/people/", {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function(test) {
-        // Generate a unique team name so that the team-creation test
-        // can be run multiple times without resetting the dataset.
-        name = "newteam" + new Date().getTime();
-        var collection = test.result.args[0];
-        collection.named_post('newTeam',
-                              {on: test.create_yui_sync_on(),
-                               parameters: {display_name: 'My new team',
-                                            name: name}});
-    },
-    'wait_action',
-    function(test) {
-        var new_entry = test.result.args[0];
-        jum.assertEquals("success", test.result.callback);
-        jum.assertTrue(new_entry instanceof LP.client.Entry);
-        jum.assertEquals(new_entry.get("display_name"), "My new team");
-        jum.assertNotEquals(new_entry.lp_original_uri.indexOf("/~newteam"),
-                            -1);
-    }
-    ]);
-
-//Test paging on a named collection.
-var test_collection_paged_named_get = new SynchronizedTest(
-    'test_collection_paged_named_get', [
-    function (test) {
-        client.get("people", {on: test.create_yui_sync_on() });
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var collection = test.result.args[0];
-        collection.named_get(
-                             'find', {on: test.create_yui_sync_on(),
-                                      parameters: {text: 'salgado'},
-                                      start: 10});
-    },
-    'wait_action',
-    function (test) {
-        jum.assertEquals('success', test.result.callback);
-        var collection = test.result.args[0];
-        jum.assertTrue(collection instanceof LP.client.Collection);
-        jum.assertEquals(1, collection.total_size);
-    }
-    ]);
-
-// Test hosted file objects.
-
-// To test PUT to a hosted file we need to create a brand new
-// file. Several problems combine to make this necessary. The
-// first is that you can't send a binary file through XHR: it gets
-// truncated at the first null character. So we can't just PUT to
-// a mugshot or icon. There are some product release files in the
-// preexisting dataset, but they don't have anything backing them
-// in the librarian, so we can't get a proper handle on them. So
-// we need to create a brand new file and then test PUT on it.
-
-// Unfortunately, currently there are no files you can create with
-// PUT, so we can't test this.
-
-test_logged_in_as_foo_bar.test_hosted_files = new SynchronizedTest(
-
-    'test_hosted_files', [
-    function(test) {
-        var bug_uri = '/bugs/15';
-        client.named_post(bug_uri, 'addAttachment',
-            {on: test.create_yui_sync_on(),
-             parameters: {comment: 'A new attachment',
-                          content_type: 'text/plain',
-                          data: 'Some data.',
-                          filename: 'foo.txt'}});
-    },
-    'wait_action',
-    function(test) {
-        jum.assertEquals('success', test.result.callback);
-        var attachment = test.result.args[0];
-        attachment.follow_link('data',
-                               {on: test.create_yui_sync_on()});
-    },
-    'wait_action',
-    function(test) {
-        jum.assertEquals('success', test.result.callback);
-        var hosted_file = test.result.args[0];
-
-// Unfortunately, there's no hosted file that can be edited through
-// the web service, so we can't test PUT.
-//         hosted_file.contents = "['Unit tester was here.']";
-//         hosted_file.filename = "unittest.json";
-//         hosted_file.content_type = "application/json";
-//         hosted_file.lp_save({on: test.create_yui_sync_on()});
-//     },
-//     'wait_action',
-//     function(test) {
-//         jum.assertEquals('success', test.result.callback);
-//         var hosted_file = test.result.args[2];
-         hosted_file.lp_delete({on: test.create_yui_sync_on()});
-     },
-     'wait_action',
-     function(test) {
-         jum.assertEquals('failure', test.result.callback);
-         // XXX flacoste 2008/12/12 bug=307539
-         // This code works right now, but when testing a hosted file
-         // that can be edited through the web service, it will fail.
-         var request = test.result.args[1];
-         jum.assertEquals(405, request.status);
-     }
-     ]
- );

=== removed file 'lib/canonical/launchpad/windmill/jstests/login.js'
--- lib/canonical/launchpad/windmill/jstests/login.js	2009-06-30 21:06:27 +0000
+++ lib/canonical/launchpad/windmill/jstests/login.js	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/* 
-Copyright 2009 Canonical Ltd.  This software is licensed under the
-GNU Affero General Public License version 3 (see the file LICENSE).
-
-Namespaces for tests requiring to be logged in.
-*/
-
-
-/* Logged in as Foo Bar. */
-var test_logged_in_as_foo_bar = {};
-test_logged_in_as_foo_bar.setup = [
-    {"params": {"link": "Log in \/ Register"}, 
-        "method": "asserts.assertNode"},
-    {"params": {"link": "Log in \/ Register"}, "method": "click"},
-    {"params": {}, "method": "waits.forPageLoad"},
-    {"params": {"id": "email"}, "method": "waits.forElement"},
-    {"params": {"text": "[e-mail]", "id": "email"}, 
-        "method": "type"},
-    {"params": {"text": "test", "id": "password"}, "method": "type"},
-    {"params": {"name": "loginpage_submit_login"}, "method": "click"},
-    {"params": {}, "method": "waits.forPageLoad"},
-    {"params": {"link": "Foo Bar"}, "method": "waits.forElement"}
-    ];
-
-test_logged_in_as_foo_bar.teardown = [
-    {"params": {"name": "logout"}, "method": "click"},
-    // We need the waits.forPageLoad here because it's likely that the
-    // xpath expression might match on the previous page.
-    {"params": {}, "method": "waits.forPageLoad"},
-    {"params": {"xpath": "\/html\/body[@id='document']\/div[@id='mainarea']\/div[@id='container']\/div"}, "method": "waits.forElement"},
-    {"params": {"xpath": "\/html\/body[@id='document']\/div[@id='mainarea']\/div[@id='container']\/div", "validator": "You have been logged out"}, "method": "asserts.assertText"}
-    ];

=== modified file 'lib/lp/bugs/browser/bugsubscription.py'
--- lib/lp/bugs/browser/bugsubscription.py	2011-06-17 10:44:18 +0000
+++ lib/lp/bugs/browser/bugsubscription.py	2011-06-30 22:44:42 +0000
@@ -540,7 +540,7 @@
         details = list(bug.getDirectSubscribersWithDetails())
         api_request = IWebServiceClientRequest(self.request)
         for person, subscription in details:
-            can_edit = self.user is not None and self.user.inTeam(person)
+            can_edit = subscription.canBeUnsubscribedByUser(self.user)
             if person == self.user or (person.private and not can_edit):
                 # Skip the current user viewing the page,
                 # and private teams user is not a member of.

=== modified file 'lib/lp/bugs/browser/tests/test_bugsubscription_views.py'
--- lib/lp/bugs/browser/tests/test_bugsubscription_views.py	2011-06-17 10:31:55 +0000
+++ lib/lp/bugs/browser/tests/test_bugsubscription_views.py	2011-06-30 22:44:42 +0000
@@ -7,6 +7,7 @@
 
 from simplejson import dumps
 
+from zope.component import getUtility
 from zope.traversing.browser import absoluteURL
 
 from canonical.launchpad.ftests import LaunchpadFormHarness
@@ -19,10 +20,12 @@
     BugSubscriptionSubscribeSelfView,
     )
 from lp.bugs.enum import BugNotificationLevel
+from lp.registry.interfaces.person import IPersonSet
 from lp.testing import (
     person_logged_in,
     TestCaseWithFactory,
     )
+from lp.testing.sampledata import ADMIN_EMAIL
 from lp.testing.views import create_initialized_view
 
 
@@ -573,6 +576,67 @@
             self.assertEqual(
                 dumps([expected_result]), harness.view.subscriber_data_js)
 
+    def test_data_subscription_lp_admin(self):
+        # For a subscription, subscriber_data_js has can_edit
+        # set to true for a Launchpad admin.
+        bug = self._makeBugWithNoSubscribers()
+        member = self.factory.makePerson()
+        subscriber = self.factory.makePerson(
+            name='user', displayname='Subscriber Name')
+        with person_logged_in(member):
+            bug.subscribe(subscriber, subscriber,
+                          level=BugNotificationLevel.LIFECYCLE)
+        harness = LaunchpadFormHarness(
+            bug, BugPortletSubscribersWithDetails)
+        api_request = IWebServiceClientRequest(harness.request)
+
+        expected_result = {
+            'subscriber': {
+                'name': 'user',
+                'display_name': 'Subscriber Name',
+                'is_team': False,
+                'can_edit': True,
+                'web_link': canonical_url(subscriber),
+                'self_link': absoluteURL(subscriber, api_request),
+                },
+            'subscription_level': "Lifecycle",
+            }
+
+        # Login as admin
+        admin = getUtility(IPersonSet).find(ADMIN_EMAIL).any()
+        with person_logged_in(admin):
+            self.assertEqual(
+                dumps([expected_result]), harness.view.subscriber_data_js)
+
+    def test_data_person_subscription_subscriber(self):
+        # For a subscription, subscriber_data_js has can_edit
+        # set to true for the subscriber.
+        bug = self._makeBugWithNoSubscribers()
+        subscriber = self.factory.makePerson(
+            name='user', displayname='Subscriber Name')
+        subscribed_by = self.factory.makePerson(
+            name='someone', displayname='Subscribed By Name')
+        with person_logged_in(subscriber):
+            bug.subscribe(subscriber, subscribed_by,
+                          level=BugNotificationLevel.LIFECYCLE)
+        harness = LaunchpadFormHarness(bug, BugPortletSubscribersWithDetails)
+        api_request = IWebServiceClientRequest(harness.request)
+
+        expected_result = {
+            'subscriber': {
+                'name': 'user',
+                'display_name': 'Subscriber Name',
+                'is_team': False,
+                'can_edit': True,
+                'web_link': canonical_url(subscriber),
+                'self_link': absoluteURL(subscriber, api_request),
+                },
+            'subscription_level': "Lifecycle",
+            }
+        with person_logged_in(subscribed_by):
+            self.assertEqual(
+                dumps([expected_result]), harness.view.subscriber_data_js)
+
     def test_data_person_subscription_user_excluded(self):
         # With the subscriber logged in, he is not included in the results.
         bug = self._makeBugWithNoSubscribers()

=== modified file 'lib/lp/bugs/javascript/subscribers_list.js'
--- lib/lp/bugs/javascript/subscribers_list.js	2011-06-27 14:23:58 +0000
+++ lib/lp/bugs/javascript/subscribers_list.js	2011-06-30 22:44:42 +0000
@@ -325,7 +325,8 @@
 
     function on_success() {
         loader.subscribers_list.stopSubscriberActivity(subscriber, true);
-        loader._addUnsubscribeLinkIfTeamMember(subscriber);
+        loader.subscribers_list.addUnsubscribeAction(
+            subscriber, loader._getUnsubscribeCallback());
     }
     function on_failure(t_id, response) {
         loader.subscribers_list.stopSubscriberActivity(
@@ -347,44 +348,6 @@
 };
 
 /**
- * Add unsubscribe link for a team if the currently logged in user
- * is member of the team.
- *
- * @method _addUnsubscribeLinkIfTeamMember
- * @param team {Object} A person object as returned via API.
- */
-BugSubscribersLoader.prototype
-._addUnsubscribeLinkIfTeamMember = function(team) {
-    var loader = this;
-    function on_success(members) {
-        var team_member = false;
-        var i;
-        for (i=0; i<members.entries.length; i++) {
-            if (members.entries[i].get('member_link') ===
-                Y.lp.client.get_absolute_uri(LP.links.me)) {
-                team_member = true;
-                break;
-            }
-        }
-        if (team_member === true) {
-            // Add unsubscribe action for the team member.
-            loader.subscribers_list.addUnsubscribeAction(
-                team, loader._getUnsubscribeCallback());
-        }
-    }
-
-    if (Y.Lang.isString(LP.links.me) && team.is_team) {
-        var config = {
-            on: { success: on_success }
-        };
-
-        var members_link = team.members_details_collection_link;
-        this.lp_client.get(members_link, config);
-    }
-};
-
-
-/**
  * Manages entire subscribers' list for a single bug.
  *
  * If the passed in container_box is not present, or if there are multiple

=== modified file 'lib/lp/bugs/javascript/tests/test_subscribers_list.js'
--- lib/lp/bugs/javascript/tests/test_subscribers_list.js	2011-06-28 16:26:34 +0000
+++ lib/lp/bugs/javascript/tests/test_subscribers_list.js	2011-06-30 22:44:42 +0000
@@ -2002,8 +2002,8 @@
 
     test_subscribeSomeoneElse_success: function() {
         // When subscribing someone else succeeds, stopSubscriberActivity
-        // is called indicating success, and _addUnsubscribeLinkIfTeamMember
-        // is called to add unsubscribe-link when needed.
+        // is called indicating success, and addUnsubscribeAction
+        // is called with the correct parameters.
 
         var subscriber = { name: "user", self_link: "/~user" };
 
@@ -2011,17 +2011,29 @@
         var loader = setUpLoader(this.root);
         loader.subscribers_list.addSubscriber(subscriber, "Maybe");
 
-        // Mock-up addUnsubscribeLinkIfTeamMember method to
+        // Mock-up addUnsubscribeAction method to
         // ensure it's called with the right parameters.
-        var subscriber_link_added = false;
-        var old_addLink =
-            module.BugSubscribersLoader
-            .prototype._addUnsubscribeLinkIfTeamMember;
-        module.BugSubscribersLoader.prototype
-            ._addUnsubscribeLinkIfTeamMember =
-            function(my_subscriber) {
+        // We need to stub the _getUnsubscribeCallback result so we can check
+        // the unsubscribe_callback.
+        var unsubscribe_callback = function() {};
+        // Save old methods for restoring later.
+        var old_getUnsub = module.BugSubscribersLoader.prototype
+            ._getUnsubscribeCallback;
+
+        // Make _getUnsubscribeCallback return the new callback.
+        module.BugSubscribersLoader.prototype._getUnsubscribeCallback =
+            function() {
+                return unsubscribe_callback;
+            };
+
+        var unsubscribe_link_added = false;
+        var old_unsubscribe_action =
+            module.SubscribersList.prototype.addUnsubscribeAction;
+        module.SubscribersList.prototype.addUnsubscribeAction =
+            function(my_subscriber, callback) {
                 Y.Assert.areSame(subscriber, my_subscriber);
-                subscriber_link_added = true;
+                Y.Assert.areEqual(unsubscribe_callback, callback);
+                unsubscribe_link_added = true;
             };
 
         // Mock-up stopSubscriberActivity to ensure it's called.
@@ -2051,12 +2063,14 @@
 
         loader._subscribeSomeoneElse(person);
 
-        Y.Assert.isTrue(subscriber_link_added);
+        Y.Assert.isTrue(unsubscribe_link_added);
         Y.Assert.isFalse(activity_on);
 
         // Restore original methods.
-        module.BugSubscribersLoader.prototype.addUnsubscribeLinkIfTeamMember =
-            old_addLink;
+        module.SubscribersList.prototype.addUnsubscribeAction =
+            old_unsubscribe_action;
+        module.BugSubscribersLoader.prototype._getUnsubscribeCallback =
+            old_getUnsub;
         module.SubscribersList.prototype.stopSubscriberActivity =
             old_indicate;
 

=== modified file 'lib/lp/bugs/stories/bug-privacy/05-set-bug-private-as-admin.txt'
--- lib/lp/bugs/stories/bug-privacy/05-set-bug-private-as-admin.txt	2011-06-16 13:50:58 +0000
+++ lib/lp/bugs/stories/bug-privacy/05-set-bug-private-as-admin.txt	2011-06-30 22:44:42 +0000
@@ -15,7 +15,7 @@
     ...     "http://launchpad.dev/bugs/2/+bug-portlet-subscribers-details")
 
     >>> print_direct_subscribers(browser.contents)
-    Steve Alexander
+    Steve Alexander (Unsubscribe)
     >>> print_also_notified(browser.contents)
     Also notified:
     Sample Person
@@ -38,8 +38,8 @@
   >>> browser.open(
   ...     "http://launchpad.dev/bugs/2/+bug-portlet-subscribers-details")
   >>> print_direct_subscribers(browser.contents)
-  Sample Person
-  Steve Alexander
+  Sample Person (Unsubscribe)
+  Steve Alexander (Unsubscribe)
   Ubuntu Team (Unsubscribe)
 
   >>> print_also_notified(browser.contents)

=== modified file 'lib/lp/bugs/stories/bugs/bug-add-subscriber.txt'
--- lib/lp/bugs/stories/bugs/bug-add-subscriber.txt	2011-06-16 13:50:58 +0000
+++ lib/lp/bugs/stories/bugs/bug-add-subscriber.txt	2011-06-30 22:44:42 +0000
@@ -67,7 +67,7 @@
     ...     'http://bugs.launchpad.dev/bugs/1/'
     ...     '+bug-portlet-subscribers-details')
     >>> print_direct_subscribers(user_browser.contents)
-    David Allouche
+    David Allouche (Unsubscribe)
     Sample Person
     Steve Alexander
 
@@ -110,8 +110,8 @@
     ...     'http://bugs.launchpad.dev/bugs/1/'
     ...     '+bug-portlet-subscribers-details')
     >>> print_direct_subscribers(user_browser.contents)
-    David Allouche
-    Landscape Developers
+    David Allouche (Unsubscribe)
+    Landscape Developers (Unsubscribe)
     Sample Person
     Steve Alexander
 
@@ -144,11 +144,11 @@
     ...     'http://bugs.launchpad.dev/bugs/1/'
     ...     '+bug-portlet-subscribers-details')
     >>> print_direct_subscribers(foobar_browser.contents)
-    David Allouche
-    Landscape Developers
+    David Allouche (Unsubscribe)
+    Landscape Developers (Unsubscribe)
     Private Team (Unsubscribe)
-    Sample Person
-    Steve Alexander
+    Sample Person (Unsubscribe)
+    Steve Alexander (Unsubscribe)
 
 Someone not in the team will not see the private team in the
 subscribers list.
@@ -157,8 +157,8 @@
     ...     'http://bugs.launchpad.dev/bugs/1/'
     ...     '+bug-portlet-subscribers-details')
     >>> print_direct_subscribers(user_browser.contents)
-    David Allouche
-    Landscape Developers
+    David Allouche (Unsubscribe)
+    Landscape Developers (Unsubscribe)
     Sample Person
     Steve Alexander