Merge lp:~wallyworld/launchpad/additional-affiliation-types into lp:launchpad

[Ian Booth]

Add to the affiliation adaptor to provide affiliation for other entity types like Question, DistroSeries, ProductSeries, Specification

This branch adds to the affiliation adaptor to provide affiliation for other entity types:
- Specification
- Question
- Distribution
- DistroSeries
- ProductSeries
- Product

== Implementation ==

Add extra affiliation adaptors for the additional context types. Checks are done for:
owner
driver
security contact
bug supervisor

Some contexts have pillars eg BugTask has a product or distribution; a distroseries has a distribution. The context is checked first. If the context doesn't match on the given attribute (eg owner), then the pillar is checked. If there is no match on owner, then driver is checked etc.

I think this mp also covers the intent of bug 81692, although that bug talks about additional checks eg registrant. Do we consider the work done here sufficient to address that bug?

== Tests ==

Add a bunch of tests to test_pillaraffiliation

== Lint ==

Linting changed files:
  lib/lp/registry/configure.zcml
  lib/lp/registry/model/pillaraffiliation.py
  lib/lp/registry/tests/test_pillaraffiliation.py

[Curtis Hovey (sinzui)]

> === modified file 'lib/lp/registry/model/pillaraffiliation.py'
> --- lib/lp/registry/model/pillaraffiliation.py 2011-08-04 14:31:56 +0000
> +++ lib/lp/registry/model/pillaraffiliation.py 2011-08-04 14:32:17 +0000
...
> + def getPillar(self):
> + return self.context
> +
> + def getAffiliationBadge(self, person):
> + """ Return the affiliation information for a person given a context.
> +
> + The context is a Distribution, Product etc and is associated with a
> + pillar. Checks are done to see if the person is associated with the
> + context first (owner, driver etc) and if not, then the pillar.
> + """
> + pillar = self.getPillar()
> +
> + def checkAffiliation(capability, attribute, role):
> + # Check the affiliation defined by the specified capability on the
> + # context and then pillar. Capability is IHasOwner etc. WHatever
> + # matches first (context or pillar) is used for the display name.
> + affiliated_entity = None
> + capabilityProvidedBy = getattr(capability, 'providedBy')
> + if capabilityProvidedBy(self.context):
> + if person.inTeam(getattr(self.context, attribute)):
> + affiliated_entity = self.context.displayname
> + if (affiliated_entity is None and capabilityProvidedBy(pillar)):
> + if person.inTeam(getattr(pillar, attribute)):
> + affiliated_entity = pillar.displayname
> + if affiliated_entity is None:
> + return None
> + return affiliated_entity, role

I do not see why this is an inner function. This could be simpler too if
we decide that all we care about is product or distribution. We know how to
check owner, drivers, and other roles. The other kinds of items I
see returned, notably for specification and question are probably wrong.
We do not need the interface checks if we are certain we are getting a
distro or product.

I have some doubts about the universality of these checks. I think
owner and driver are universal. bug_supervisor and security contact are
only useful in bugs and branches cases that deal with privacy and security.
eg assigning a branch reviewer, bug assignee, subscriber.

Questions might care more about answer contacts which are more likely to
be assigned. Consider Ubuntu. The owners and drivers are rarely assigned.
when I assign a question, I care about the answer contact for the package
first, then the contacts for Ubuntu.

Specifications care about the people who are assignees, drafters, approvers,
and need feedback. In most cases these people are owners and drivers. There
is a rare case for the approver who is for the series goal...

The series is the problem. Maybe a separate branch becuase it is a rule
that may not prove very important. The series driver (release manager) is
the most important person for bugs that affect a series or blueprints with
a series goal. Those driver are assumed to be a subset of owner or drivers
who have the authority to define the work for a series. I happen to know
that This is not an issue for Ubuntu or any of our major pro...

review: Needs Information (code)

[Ian Booth (wallyworld)]

Thanks for the review. Clearly I'm missing some knowledge.

On 05/08/11 05:22, Curtis Hovey wrote:
> Review: Needs Information code
>> === modified file 'lib/lp/registry/model/pillaraffiliation.py'
>> --- lib/lp/registry/model/pillaraffiliation.py 2011-08-04 14:31:56 +0000
>> +++ lib/lp/registry/model/pillaraffiliation.py 2011-08-04 14:32:17 +0000
> ...
>> + def getPillar(self):
>> + return self.context
>> +
>> + def getAffiliationBadge(self, person):
>> + """ Return the affiliation information for a person given a context.
>> +
>> + The context is a Distribution, Product etc and is associated with a
>> + pillar. Checks are done to see if the person is associated with the
>> + context first (owner, driver etc) and if not, then the pillar.
>> + """
>> + pillar = self.getPillar()
>> +
>> + def checkAffiliation(capability, attribute, role):
>> + # Check the affiliation defined by the specified capability on the
>> + # context and then pillar. Capability is IHasOwner etc. WHatever
>> + # matches first (context or pillar) is used for the display name.
>> + affiliated_entity = None
>> + capabilityProvidedBy = getattr(capability, 'providedBy')
>> + if capabilityProvidedBy(self.context):
>> + if person.inTeam(getattr(self.context, attribute)):
>> + affiliated_entity = self.context.displayname
>> + if (affiliated_entity is None and capabilityProvidedBy(pillar)):
>> + if person.inTeam(getattr(pillar, attribute)):
>> + affiliated_entity = pillar.displayname
>> + if affiliated_entity is None:
>> + return None
>> + return affiliated_entity, role
>
> I do not see why this is an inner function. This could be simpler too if

Me either.

> we decide that all we care about is product or distribution. We know how to
> check owner, drivers, and other roles. The other kinds of items I
> see returned, notably for specification and question are probably wrong.
> We do not need the interface checks if we are certain we are getting a
> distro or product.
>

Will we always be getting a distro or product though? If I have a
Specification, wouldn't I want to possibly first see if the person in
question is affiliated with the specification itself and then check the
affiliation with the target (product/distro) only if the specification
check turned up empty?

> I have some doubts about the universality of these checks. I think
> owner and driver are universal. bug_supervisor and security contact are
> only useful in bugs and branches cases that deal with privacy and security.
> eg assigning a branch reviewer, bug assignee, subscriber.
>

This suggests we need another piece of context information to properly
determine the affiliation - the name of the attribute that is being
updated with the person, not just the person alone. So instead of saying
"we are associating person fred with bugtask 4 in some capacity" we are
saying "we are associating person fred with bugtask 4 as an assignee"
and that this distinction possibly affect...

[lp:~wallyworld/launchpad/additional-affiliation-types]

13603. By Ian Booth on 2011-08-05

Rework affiliation checks and reimplement question adaptor

13604. By Ian Booth on 2011-08-05

Reimplement specification adaptor

13605. By Ian Booth on 2011-08-05

Reimplement distro/product affiliation adaptors and fix tests

13606. By Ian Booth on 2011-08-05

Add extra tests for distroseries and productseries

13607. By Ian Booth on 2011-08-05

Merge from trunk

Unmerged revisions

13607. By Ian Booth on 2011-08-05

Merge from trunk

13606. By Ian Booth on 2011-08-05

Add extra tests for distroseries and productseries

13605. By Ian Booth on 2011-08-05

Reimplement distro/product affiliation adaptors and fix tests

13604. By Ian Booth on 2011-08-05

Reimplement specification adaptor

13603. By Ian Booth on 2011-08-05

Rework affiliation checks and reimplement question adaptor

13602. By Ian Booth on 2011-08-04

Lint

13601. By Ian Booth on 2011-08-04

Lint

13600. By Ian Booth on 2011-08-04

Implement affiliation for other entity types

13599. By Ian Booth on 2011-08-04

Merge from trunk

13598. By Ian Booth on 2011-08-03

Improve affiliatin text

=== modified file 'lib/lp/app/browser/tests/test_vocabulary.py'
--- lib/lp/app/browser/tests/test_vocabulary.py	2011-08-05 04:51:58 +0000
+++ lib/lp/app/browser/tests/test_vocabulary.py	2011-08-04 15:47:10 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 # Copyright 2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -271,271 +270,3 @@
         self.assertEqual(6, result['total_size'])
         self.assertEqual(1, len(result['entries']))
         self.assertEqual('pting-2', result['entries'][0]['value'])
-=======
-# Copyright 2011 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Test vocabulary adapters."""
-
-__metaclass__ = type
-
-from datetime import datetime
-from urllib import urlencode
-
-import pytz
-import simplejson
-
-from zope.app.form.interfaces import MissingInputError
-from zope.component import (
-    getSiteManager,
-    getUtility,
-    )
-from zope.interface import implements
-from zope.schema.interfaces import IVocabularyFactory
-from zope.schema.vocabulary import SimpleTerm
-from zope.security.proxy import removeSecurityProxy
-
-
-from canonical.launchpad.interfaces.launchpad import ILaunchpadRoot
-from canonical.launchpad.webapp.vocabulary import (
-    CountableIterator,
-    IHugeVocabulary,
-    )
-from canonical.testing.layers import DatabaseFunctionalLayer
-from lp.app.browser.vocabulary import (
-    IPickerEntry,
-    MAX_DESCRIPTION_LENGTH,
-    )
-from lp.app.errors import UnexpectedFormData
-from lp.registry.interfaces.irc import IIrcIDSet
-from lp.services.features.testing import FeatureFixture
-from lp.testing import (
-    login_person,
-    TestCaseWithFactory,
-    )
-from lp.testing.views import create_view
-
-
-class PersonPickerEntryAdapterTestCase(TestCaseWithFactory):
-
-    layer = DatabaseFunctionalLayer
-
-    def test_person_to_pickerentry(self):
-        # IPerson can be adpated to IPickerEntry.
-        person = self.factory.makePerson()
-        adapter = IPickerEntry(person)
-        self.assertTrue(IPickerEntry.providedBy(adapter))
-
-    def test_PersonPickerEntryAdapter_email_anonymous(self):
-        # Anonymous users cannot see entry email addresses.
-        person = self.factory.makePerson(email='[e-mail]')
-        entry = IPickerEntry(person).getPickerEntry(None)
-        self.assertEqual('<email address hidden>', entry.description)
-
-    def test_PersonPickerEntryAdapter_visible_email_logged_in(self):
-        # Logged in users can see visible email addresses.
-        observer = self.factory.makePerson()
-        login_person(observer)
-        person = self.factory.makePerson(email='[e-mail]')
-        entry = IPickerEntry(person).getPickerEntry(None)
-        self.assertEqual('[e-mail]', entry.description)
-
-    def test_PersonPickerEntryAdapter_hidden_email_logged_in(self):
-        # Logged in users cannot see hidden email addresses.
-        person = self.factory.makePerson(email='[e-mail]')
-        login_person(person)
-        person.hide_email_addresses = True
-        observer = self.factory.makePerson()
-        login_person(observer)
-        entry = IPickerEntry(person).getPickerEntry(None)
-        self.assertEqual('<email address hidden>', entry.description)
-
-    def test_PersonPickerEntryAdapter_no_email_logged_in(self):
-        # Teams without email address have no desriptions.
-        team = self.factory.makeTeam()
-        observer = self.factory.makePerson()
-        login_person(observer)
-        entry = IPickerEntry(team).getPickerEntry(None)
-        self.assertEqual(None, entry.description)
-
-    def test_PersonPickerEntryAdapter_logged_in(self):
-        # Logged in users can see visible email addresses.
-        observer = self.factory.makePerson()
-        login_person(observer)
-        person = self.factory.makePerson(
-            email='[e-mail]', name='snarf')
-        entry = IPickerEntry(person).getPickerEntry(None)
-        self.assertEqual('sprite person', entry.css)
-        self.assertEqual('sprite new-window', entry.link_css)
-
-    def test_PersonPickerEntryAdapter_enhanced_picker_enabled_user(self):
-        # The enhanced person picker provides more information for users.
-        person = self.factory.makePerson(email='[e-mail]', name='snarf')
-        creation_date = datetime(
-            2005, 01, 30, 0, 0, 0, 0, pytz.timezone('UTC'))
-        removeSecurityProxy(person).datecreated = creation_date
-        getUtility(IIrcIDSet).new(person, 'eg.dom', 'snarf')
-        getUtility(IIrcIDSet).new(person, 'ex.dom', 'pting')
-        entry = IPickerEntry(person).getPickerEntry(
-            None, enhanced_picker_enabled=True)
-        self.assertEqual('http://launchpad.dev/~snarf', entry.alt_title_link)
-        self.assertEqual(
-            ['snarf on eg.dom, pting on ex.dom', 'Member since 2005-01-30'],
-            entry.details)
-
-    def test_PersonPickerEntryAdapter_enhanced_picker_enabled_team(self):
-        # The enhanced person picker provides more information for teams.
-        team = self.factory.makeTeam(email='[e-mail]', name='fnord')
-        entry = IPickerEntry(team).getPickerEntry(
-            None, enhanced_picker_enabled=True)
-        self.assertEqual('http://launchpad.dev/~fnord', entry.alt_title_link)
-        self.assertEqual(['Team members: 1'], entry.details)
-
-    def test_PersonPickerEntryAdapter_enhanced_picker_enabled_badges(self):
-        # The enhanced person picker provides affilliation information.
-        person = self.factory.makePerson(email='[e-mail]', name='snarf')
-        project = self.factory.makeProduct(name='fnord', owner=person)
-        bugtask = self.factory.makeBugTask(target=project)
-        entry = IPickerEntry(person).getPickerEntry(
-            bugtask, enhanced_picker_enabled=True)
-        self.assertEqual(1, len(entry.badges))
-        self.assertEqual('/@@/product-badge', entry.badges[0]['url'])
-        self.assertEqual('Affiliated with Fnord', entry.badges[0]['alt'])
-
-
-class TestPersonVocabulary:
-    implements(IHugeVocabulary)
-    test_persons = []
-
-    @classmethod
-    def setTestData(cls, person_list):
-        cls.test_persons = person_list
-
-    def __init__(self, context):
-        self.context = context
-
-    def toTerm(self, person):
-        return SimpleTerm(person, person.name, person.displayname)
-
-    def searchForTerms(self, query=None):
-        found = [
-            person for person in self.test_persons if query in person.name]
-        return CountableIterator(len(found), found, self.toTerm)
-
-
-class HugeVocabularyJSONViewTestCase(TestCaseWithFactory):
-
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        super(HugeVocabularyJSONViewTestCase, self).setUp()
-        test_persons = []
-        for name in range(1, 7):
-            test_persons.append(
-                self.factory.makePerson(name='pting-%s' % name))
-        TestPersonVocabulary.setTestData(test_persons)
-        getSiteManager().registerUtility(
-            TestPersonVocabulary, IVocabularyFactory, 'TestPerson')
-        self.addCleanup(
-            getSiteManager().unregisterUtility,
-            TestPersonVocabulary, IVocabularyFactory, 'TestPerson')
-        self.addCleanup(TestPersonVocabulary.setTestData, [])
-
-    @staticmethod
-    def create_vocabulary_view(form):
-        context = getUtility(ILaunchpadRoot)
-        query_string = urlencode(form)
-        return create_view(
-            context, '+huge-vocabulary', form=form, query_string=query_string)
-
-    def test_name_field_missing_error(self):
-        view = self.create_vocabulary_view({})
-        self.assertRaisesWithContent(
-            MissingInputError, "('name', '', None)", view.__call__)
-
-    def test_search_text_field_missing_error(self):
-        view = self.create_vocabulary_view({'name': 'TestPerson'})
-        self.assertRaisesWithContent(
-            MissingInputError, "('search_text', '', None)", view.__call__)
-
-    def test_vocabulary_name_unknown_error(self):
-        form = dict(name='snarf', search_text='pting')
-        view = self.create_vocabulary_view(form)
-        self.assertRaisesWithContent(
-            UnexpectedFormData, "Unknown vocabulary 'snarf'", view.__call__)
-
-    def test_json_entries(self):
-        # The results are JSON encoded.
-        feature_flag = {'disclosure.picker_enhancements.enabled': 'on'}
-        flags = FeatureFixture(feature_flag)
-        flags.setUp()
-        self.addCleanup(flags.cleanUp)
-        team = self.factory.makeTeam(name='pting-team')
-        TestPersonVocabulary.test_persons.append(team)
-        form = dict(name='TestPerson', search_text='pting-team')
-        view = self.create_vocabulary_view(form)
-        result = simplejson.loads(view())
-        expected = {
-            "alt_title": team.name,
-            "alt_title_link": "http://launchpad.dev/~%s" % team.name,
-            "api_uri": "/~%s" % team.name,
-            "css": "sprite team",
-            "details": ['Team members: 1'],
-            "link_css": "sprite new-window",
-            "metadata": "team",
-            "title": team.displayname,
-            "value": team.name
-            }
-        self.assertTrue('entries' in result)
-        self.assertContentEqual(
-            expected.items(), result['entries'][0].items())
-
-    def test_max_description_size(self):
-        # Descriptions over 120 characters are truncated and ellipsised.
-        email = 'pting-' * 19 + '@example.dom'
-        person = self.factory.makePerson(name='pting-n', email=email)
-        TestPersonVocabulary.test_persons.append(person)
-        # Login to gain permission to know the email address that used
-        # for the description
-        login_person(person)
-        form = dict(name='TestPerson', search_text='pting-n')
-        view = self.create_vocabulary_view(form)
-        result = simplejson.loads(view())
-        expected = (email[:MAX_DESCRIPTION_LENGTH - 3] + '...')
-        self.assertEqual(
-            'pting-n', result['entries'][0]['value'])
-        self.assertEqual(
-            expected, result['entries'][0]['description'])
-
-    def test_default_batch_size(self):
-        # The results are batched.
-        form = dict(name='TestPerson', search_text='pting')
-        view = self.create_vocabulary_view(form)
-        result = simplejson.loads(view())
-        total_size = result['total_size']
-        entries = len(result['entries'])
-        self.assertTrue(
-            total_size > entries,
-            'total_size: %d is less than entries: %d' % (total_size, entries))
-
-    def test_batch_size(self):
-        # A The batch size can be specified with the batch param.
-        form = dict(
-            name='TestPerson', search_text='pting',
-            start='0', batch='1')
-        view = self.create_vocabulary_view(form)
-        result = simplejson.loads(view())
-        self.assertEqual(6, result['total_size'])
-        self.assertEqual(1, len(result['entries']))
-
-    def test_start_offset(self):
-        # The offset of the batch is specified with the start param.
-        form = dict(
-            name='TestPerson', search_text='pting',
-            start='1', batch='1')
-        view = self.create_vocabulary_view(form)
-        result = simplejson.loads(view())
-        self.assertEqual(6, result['total_size'])
-        self.assertEqual(1, len(result['entries']))
-        self.assertEqual('pting-2', result['entries'][0]['value'])
->>>>>>> MERGE-SOURCE
 
=== modified file 'lib/lp/app/browser/vocabulary.py'
--- lib/lp/app/browser/vocabulary.py	2011-08-05 04:51:58 +0000
+++ lib/lp/app/browser/vocabulary.py	2011-08-04 15:18:04 +0000
@@ -161,7 +161,6 @@
             # We will linkify the person's name so it can be clicked to open
             # the page for that person.
             extra.alt_title_link = canonical_url(person, rootsite='mainsite')
-            extra.details = []
             # We will display the person's irc nick(s) after their email
             # address in the description text.
             irc_nicks = None
@@ -169,7 +168,6 @@
                 irc_nicks = ", ".join(
                     [IRCNicknameFormatterAPI(ircid).displayname()
                     for ircid in person.ircnicknames])
-<<<<<<< TREE
             if irc_nicks and not picker_expander_enabled:
                 if extra.description:
                     extra.description = ("%s (%s)" %
@@ -186,17 +184,6 @@
                     extra.details.append(
                         'Member since %s' % DateTimeFormatterAPI(
                             person.datecreated).date())
-=======
-            if irc_nicks:
-                    extra.details.append(irc_nicks)
-            if person.is_team:
-                extra.details.append(
-                    'Team members: %s' % person.all_member_count)
-            else:
-                extra.details.append(
-                    'Member since %s' % DateTimeFormatterAPI(
-                        person.datecreated).date())
->>>>>>> MERGE-SOURCE
 
         return extra
 
 
=== modified file 'lib/lp/app/javascript/picker/picker.js'
--- lib/lp/app/javascript/picker/picker.js	2011-08-05 04:51:58 +0000
+++ lib/lp/app/javascript/picker/picker.js	2011-08-05 04:51:59 +0000
@@ -380,40 +380,11 @@
             data.title, data.title_link, data.link_css);
         li_title.appendChild(title);
         if (data.alt_title) {
-<<<<<<< TREE
-            if (!data.details) {
-                // XXX sinzui 2011-08-04: Remove this block when expanders
-                // are released.
-                var alt_link = null;
-                if (data.alt_title_link) {
-                    alt_link =Y.Node.create('<a></a>')
-                        .addClass(data.link_css)
-                        .addClass('discreet');
-                    alt_link.set('text', " Details...")
-                        .set('href', data.alt_title_link);
-                    Y.on('click', function(e) {
-                        e.halt();
-                        window.open(data.alt_title_link);
-                    }, alt_link);
-                }
-            }
-
-=======
->>>>>>> MERGE-SOURCE
             li_title.appendChild('&nbsp;(');
             var alt_title_node = Y.Node.create('<span></span>')
                 .set('text', data.alt_title);
             li_title.appendChild(alt_title_node);
             li_title.appendChild(')');
-<<<<<<< TREE
-            if (alt_link !== null) {
-                // XXX sinzui 2011-08-04: Remove this block when expanders
-                // are released.
-                li_title.appendChild(Y.Node.create('&nbsp;&nbsp;'));
-                li_title.appendChild(alt_link);
-            }
-=======
->>>>>>> MERGE-SOURCE
         }
         return li_title;
     },
@@ -458,48 +429,6 @@
     },
 
     /**
-<<<<<<< TREE
-     * Render a node containing the optional details part of the picker entry.
-     * @param data a json data object with the details to render
-     */
-    _renderDetailsUI: function(data) {
-        if (!data.details) {
-            return null;
-        }
-        var details_node = Y.Node.create('<div></div>')
-            .addClass('sprite')
-            .addClass(C_RESULT_DESCRIPTION);
-        if (Y.Lang.isArray(data.details)) {
-            var data_node = Y.Node.create('<div></div>');
-            var escaped_details = [];
-            Y.Array.each(data.details, function(detail, i) {
-                escaped_details.push(Y.Escape.html(detail));
-                });
-            data_node.append(Y.Node.create(escaped_details.join('<br />')));
-            details_node.append(data_node);
-        }
-        var links = [];
-        links.push(Y.Node.create(
-            '<a class="sprite yes save" href="#"></a>')
-                .set('text', 'Select ' + data.title));
-        links[0].on('click', function (e, value) {
-            this.fire(SAVE, value);
-            }, this, data);
-        links.push(this._text_or_link(
-            'View details', data.alt_title_link, data.link_css));
-        var link_list = Y.Node.create('<ul></ul>')
-            .addClass('horizontal');
-        Y.Array.each(links, function(link, i) {
-            var li = Y.Node.create('<li></li>');
-            li.append(link);
-            link_list.append(li);
-            });
-        details_node.append(link_list);
-        return details_node;
-    },
-
-    /**
-=======
      * Render a node containing the optional details part of the picker entry.
      * @param data a json data object with the details to render
      */
@@ -540,7 +469,6 @@
     },
 
     /**
->>>>>>> MERGE-SOURCE
      * Update the UI based on the results attribute.
      *
      * @method _syncResultsUI
 
=== modified file 'lib/lp/app/javascript/picker/tests/test_picker.js'
--- lib/lp/app/javascript/picker/tests/test_picker.js	2011-08-05 04:51:58 +0000
+++ lib/lp/app/javascript/picker/tests/test_picker.js	2011-08-05 04:51:59 +0000
@@ -148,8 +148,7 @@
                 alt_title: 'Joe Again <foo></foo>',
                 title_link: 'http://somewhere.com',
                 alt_title_link: 'http://somewhereelse.com',
-                link_css: 'cool-style',
-                details: ['Member since 2007'],
+                link_css: 'cool-style'
             }
         ]);
 
@@ -179,83 +178,6 @@
         Assert.areEqual('Joe Again <foo></foo>', alt_text_node.get('text'));
     },
 
-<<<<<<< TREE
-    test_details: function () {
-        // The details of the li is the content node of the expander.
-        this.picker.render();
-        this.picker.set('results', [
-            {
-                css: 'yui3-blah-blue',
-                value: 'jschmo',
-                title: 'Joe Schmo',
-                description: '[e-mail]',
-                details: ['joe on irc.freenode.net', 'Member since 2007'],
-                alt_title_link: '/~jschmo'
-            }
-        ]);
-        var bb = this.picker.get('boundingBox');
-        var li = bb.one('.yui3-picker-results li');
-        var details = li.expander.content_node;
-        Assert.areEqual(
-            'joe on irc.freenode.net<br>Member since 2007',
-            details.one('div').getContent());
-        Assert.areEqual(
-            'Select Joe Schmo', details.one('ul li:first-child').get('text'));
-        Assert.areEqual(
-            'View details', details.one('ul li:last-child').get('text'));
-    },
-
-    test_details_escaping: function () {
-        // The content of details is escaped.
-        this.picker.render();
-        this.picker.set('results', [
-            {
-                css: 'yui3-blah-blue',
-                value: 'jschmo',
-                title: 'Joe <Schmo>',
-                description: '[e-mail]',
-                details: ['<joe> on irc.freenode.net', 'f<nor>d maintainer'],
-                alt_title_link: '/~jschmo'
-            }
-        ]);
-        var bb = this.picker.get('boundingBox');
-        var li = bb.one('.yui3-picker-results li');
-        var details = li.expander.content_node;
-        Assert.areEqual(
-            '&lt;joe&gt; on irc.freenode.net<br>f&lt;nor&gt;d maintainer',
-            details.one('div').getContent());
-        Assert.areEqual(
-            'Select Joe &lt;Schmo&gt;',
-            details.one('ul li:first-child a').getContent('text'));
-    },
-
-    test_details_save_link: function () {
-        // The select link the li's details saves the selection.
-        this.picker.render();
-        this.picker.set('results', [
-            {
-                css: 'yui3-blah-blue',
-                value: 'jschmo',
-                title: 'Joe Schmo',
-                description: '[e-mail]',
-                alt_title_link: 'http://somewhereelse.com',
-                link_css: 'cool-style',
-                details: ['Member since 2007'],
-            }
-        ]);
-        var bb = this.picker.get('boundingBox');
-        var link_node = bb.one('a.save');
-        Assert.areEqual('Select Joe Schmo', link_node.get('text'));
-        Assert.isTrue(link_node.get('href').indexOf(window.location) === 0);
-        var selected_value = null;
-        this.picker.subscribe('save', function(e) {
-            selected_value = e.details[0].value;
-        }, this);
-        simulate(bb, 'a.save', 'click');
-        Assert.areEqual('jschmo', selected_value);
-    },
-
-=======
     test_details: function () {
         // The details of the li is the content node of the expander.
         this.picker.render();
@@ -327,7 +249,6 @@
         Assert.areEqual('jschmo', selected_value);
     },
 
->>>>>>> MERGE-SOURCE
     test_title_badges: function () {
         this.picker.render();
         var badge_info = [
 
=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2011-08-02 05:35:39 +0000
+++ lib/lp/registry/configure.zcml	2011-08-05 04:51:59 +0000
@@ -885,9 +885,27 @@
         <adapter
             factory="lp.registry.model.pillaraffiliation.BugTaskPillarAffiliation"
             />
-
-        <adapter
-            factory="lp.registry.model.pillaraffiliation.PillarAffiliation"
+        <adapter
+            factory="lp.registry.model.pillaraffiliation.QuestionPillarAffiliation"
+            />
+        <adapter
+            factory="lp.registry.model.pillaraffiliation.SpecificationPillarAffiliation"
+            />
+        <adapter
+            for="lp.registry.interfaces.distribution.IDistribution"
+            factory="lp.registry.model.pillaraffiliation.PillarAffiliation"
+            />
+        <adapter
+            for="lp.registry.interfaces.distroseries.IDistroSeries"
+            factory="lp.registry.model.pillaraffiliation.DistroSeriesPillarAffiliation"
+            />
+        <adapter
+            for="lp.registry.interfaces.product.IProduct"
+            factory="lp.registry.model.pillaraffiliation.PillarAffiliation"
+            />
+        <adapter
+            for="lp.registry.interfaces.productseries.IProductSeries"
+            factory="lp.registry.model.pillaraffiliation.ProductSeriesPillarAffiliation"
             />
 
         <!-- Using
 
=== modified file 'lib/lp/registry/model/pillaraffiliation.py'
--- lib/lp/registry/model/pillaraffiliation.py	2011-08-05 04:51:58 +0000
+++ lib/lp/registry/model/pillaraffiliation.py	2011-08-05 04:51:59 +0000
@@ -29,15 +29,14 @@
     )
 
 from canonical.launchpad.interfaces.launchpad import IHasIcon
+from lp.answers.interfaces.question import IQuestion
+from lp.blueprints.interfaces.specification import ISpecification
 from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
 from lp.bugs.interfaces.bugtask import IBugTask
-<<<<<<< TREE
-from lp.registry.interfaces.distribution import IDistribution
-=======
 from lp.bugs.interfaces.securitycontact import IHasSecurityContact
 from lp.registry.interfaces.distribution import IDistribution
-from lp.registry.interfaces.role import IHasAppointedDriver
->>>>>>> MERGE-SOURCE
+from lp.registry.interfaces.distroseries import IDistroSeries
+from lp.registry.interfaces.productseries import IProductSeries
 
 
 class IHasAffiliation(Interface):
@@ -58,7 +57,9 @@
 class PillarAffiliation(object):
     """Default affiliation adapter.
 
-    No affiliation is returned.
+    Subclasses may need to override getPillar() in order to provide the pillar
+    entity for which affiliation is to be determined. The default is just to
+    use the context object directly.
     """
 
     implements(IHasAffiliation)
@@ -66,61 +67,108 @@
     def __init__(self, context):
         self.context = context
 
-    def getAffiliationBadge(self, person):
-        return None
-
-
-# XXX: wallyworld 2011-05-24 bug=81692: TODO Work is required to determine
-# exactly what is required in terms of figuring out affiliation..
-
-@adapter(IBugTask)
-class BugTaskPillarAffiliation(PillarAffiliation):
-    """An affiliation adapter for bug tasks."""
-
-    def getAffiliationBadge(self, person):
-        pillar = self.context.pillar
-        bug_supervisor = None
-        security_contact = None
-        driver = None
-        if IHasAppointedDriver.providedBy(pillar):
-            driver = pillar.driver
-        if IHasSecurityContact.providedBy(pillar):
-            security_contact = pillar.security_contact
-        if IHasBugSupervisor.providedBy(pillar):
-            bug_supervisor = pillar.bug_supervisor
-
-        affiliated = None
+    def getPillar(self):
+        return self.context
+
+    def _getAffiliationDetails(self, person, pillar):
+        """ Return the affiliation information for a person, if any.
+
+        A person is affiliated with a pillar if they are in the list of
+        drivers or are the maintainer.
+        """
         if person.inTeam(pillar.owner):
-            affiliated = 'maintainer'
-        elif person.inTeam(driver):
-            affiliated = 'driver'
-        elif person.inTeam(bug_supervisor):
-            affiliated = 'bug supervisor'
-        elif person.inTeam(security_contact):
-            affiliated = 'security contact'
+            return pillar.displayname, 'maintainer'
+        for driver in pillar.drivers:
+            if person.inTeam(driver):
+                return pillar.displayname, 'driver'
+        return  None
 
-        if not affiliated:
+    def getAffiliationBadge(self, person):
+        """ Return the affiliation badge details for a person given a context.
+        """
+        pillar = self.getPillar()
+        affiliation_details = self._getAffiliationDetails(person, pillar)
+        if not affiliation_details:
             return None
 
-        def getIconUrl(context, default_url):
+        def getIconUrl(context, pillar, default_url):
             if IHasIcon.providedBy(context) and context.icon is not None:
                 icon_url = context.icon.getURL()
                 return icon_url
+            if IHasIcon.providedBy(pillar) and pillar.icon is not None:
+                icon_url = context.icon.getURL()
+                return icon_url
             return default_url
-<<<<<<< TREE
-
-        alt_text = "Affiliated with %s" % pillar.displayname
-        if IDistribution.providedBy(pillar):
-            icon_url = getIconUrl(pillar, "/@@/distribution-badge")
-        else:
-            icon_url = getIconUrl(pillar, "/@@/product-badge")
-        return BadgeDetails(icon_url, alt_text)
-=======
-
-        alt_text = "%s %s" % (pillar.displayname, affiliated)
-        if IDistribution.providedBy(pillar):
-            icon_url = getIconUrl(pillar, "/@@/distribution-badge")
-        else:
-            icon_url = getIconUrl(pillar, "/@@/product-badge")
-        return BadgeDetails(icon_url, alt_text)
->>>>>>> MERGE-SOURCE
+
+        alt_text = "%s %s" % affiliation_details
+        if IDistribution.providedBy(pillar):
+            default_icon_url = "/@@/distribution-badge"
+        else:
+            default_icon_url = "/@@/product-badge"
+        icon_url = getIconUrl(self.context, pillar, default_icon_url)
+        return BadgeDetails(icon_url, alt_text)
+
+
+@adapter(IBugTask)
+class BugTaskPillarAffiliation(PillarAffiliation):
+    """An affiliation adapter for bug tasks."""
+    def getPillar(self):
+        return self.context.pillar
+
+    def _getAffiliationDetails(self, person, pillar):
+        """ A person is affiliated with a bugtask based on (in order):
+        - owner of bugtask pillar
+        - driver of bugtask pillar
+        - bug supervisor of bugtask pillar
+        - security contact of bugtask pillar
+        """
+        result = super(BugTaskPillarAffiliation, self)._getAffiliationDetails(
+            person, pillar)
+        if result is not None:
+            return result
+        if person.inTeam(pillar.bug_supervisor):
+            return pillar.displayname, 'bug supervisor'
+        if person.inTeam(pillar.security_contact):
+            return pillar.displayname, 'security contact'
+
+
+@adapter(IDistroSeries)
+class DistroSeriesPillarAffiliation(PillarAffiliation):
+    """An affiliation adapter for distroseries."""
+    def getPillar(self):
+        return self.context.distribution
+
+
+@adapter(IProductSeries)
+class ProductSeriesPillarAffiliation(PillarAffiliation):
+    """An affiliation adapter for productseries."""
+    def getPillar(self):
+        return self.context.product
+
+
+@adapter(ISpecification)
+class SpecificationPillarAffiliation(PillarAffiliation):
+    """An affiliation adapter for blueprints."""
+    def getPillar(self):
+        return (self.context.target)
+
+
+@adapter(IQuestion)
+class QuestionPillarAffiliation(PillarAffiliation):
+    """An affiliation adapter for questions."""
+    def getPillar(self):
+        return self.context.product or self.context.distribution
+
+    def _getAffiliationDetails(self, person, pillar):
+        """ A person is affiliated with a question based on (in order):
+        - answer contact for question target
+        - owner of question target
+        - driver of question target
+        """
+        target = self.context.target
+        answer_contacts = target.answer_contacts
+        for answer_contact in answer_contacts:
+            if person.inTeam(answer_contact):
+                return target.displayname, 'answer contact'
+        return super(QuestionPillarAffiliation, self)._getAffiliationDetails(
+            person, pillar)
 
=== modified file 'lib/lp/registry/tests/test_pillaraffiliation.py'
--- lib/lp/registry/tests/test_pillaraffiliation.py	2011-08-05 04:51:58 +0000
+++ lib/lp/registry/tests/test_pillaraffiliation.py	2011-08-05 04:51:59 +0000
@@ -7,112 +7,173 @@
 
 from storm.store import Store
 from testtools.matchers import Equals
+from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.testing.layers import DatabaseFunctionalLayer
 from lp.registry.model.pillaraffiliation import IHasAffiliation
-from lp.testing import StormStatementRecorder, TestCaseWithFactory
+from lp.services.worlddata.interfaces.language import ILanguageSet
+from lp.testing import (
+    person_logged_in,
+    StormStatementRecorder,
+    TestCaseWithFactory,
+    )
 from lp.testing.matchers import HasQueryCount
 
 
-class TestBugTaskPillarAffiliation(TestCaseWithFactory):
+class TestPillarAffiliation(TestCaseWithFactory):
 
     layer = DatabaseFunctionalLayer
 
     def _check_affiliated_with_distro(self, person, distro, role):
-        bugtask = self.factory.makeBugTask(target=distro)
-        badge = IHasAffiliation(bugtask).getAffiliationBadge(person)
+        badge = IHasAffiliation(distro).getAffiliationBadge(person)
         self.assertEqual(
-            badge, ("/@@/distribution-badge", "Pting %s" % role))
+            ("/@@/distribution-badge", "Pting %s" % role), badge)
 
-    def test_bugtask_distro_owner_affiliation(self):
-        # A person who owns a bugtask distro is affiliated.
+    def test_distro_owner_affiliation(self):
+        # A person who owns a distro is affiliated.
         person = self.factory.makePerson()
-<<<<<<< TREE
-        distro = self.factory.makeDistribution(owner=person, name='pting')
-        bugtask = self.factory.makeBugTask(target=distro)
-=======
         distro = self.factory.makeDistribution(owner=person, name='pting')
         self._check_affiliated_with_distro(person, distro, 'maintainer')
 
-    def test_bugtask_distro_security_contact_affiliation(self):
-        # A person who is the security contact for a bugtask distro is
-        # affiliated.
+    def test_distro_driver_affiliation(self):
+        # A person who is a distro driver is affiliated.
+        person = self.factory.makePerson()
+        distro = self.factory.makeDistribution(driver=person, name='pting')
+        self._check_affiliated_with_distro(person, distro, 'driver')
+
+    def test_distro_team_driver_affiliation(self):
+        # A person who is a member of the distro driver team is affiliated.
+        person = self.factory.makePerson()
+        team = self.factory.makeTeam(members=[person])
+        distro = self.factory.makeDistribution(driver=team, name='pting')
+        self._check_affiliated_with_distro(person, distro, 'driver')
+
+    def test_no_distro_security_contact_affiliation(self):
+        # A person who is the security contact for a distro is not affiliated
+        # for simple distro affiliation checks.
+        person = self.factory.makePerson()
+        distro = self.factory.makeDistribution(security_contact=person)
+        self.assertIs(
+            None, IHasAffiliation(distro).getAffiliationBadge(person))
+
+    def test_no_distro_bug_supervisor_affiliation(self):
+        # A person who is the bug supervisor for a distro is not affiliated
+        # for simple distro affiliation checks.
+        person = self.factory.makePerson()
+        distro = self.factory.makeDistribution(bug_supervisor=person)
+        self.assertIs(
+            None, IHasAffiliation(distro).getAffiliationBadge(person))
+
+    def _check_affiliated_with_product(self, person, product, role):
+        badge = IHasAffiliation(product).getAffiliationBadge(person)
+        self.assertEqual(
+            ("/@@/product-badge", "Pting %s" % role), badge)
+
+    def test_product_driver_affiliation(self):
+        # A person who is the driver for a product is affiliated.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct(driver=person, name='pting')
+        self._check_affiliated_with_product(person, product, 'driver')
+
+    def test_product_team_driver_affiliation(self):
+        # A person who is a member of the product driver team is affiliated.
+        person = self.factory.makePerson()
+        team = self.factory.makeTeam(members=[person])
+        product = self.factory.makeProduct(driver=team, name='pting')
+        self._check_affiliated_with_product(person, product, 'driver')
+
+    def test_product_group_driver_affiliation(self):
+        # A person who is the driver for a product's group is affiliated.
+        person = self.factory.makePerson()
+        project = self.factory.makeProject(driver=person)
+        product = self.factory.makeProduct(project=project, name='pting')
+        self._check_affiliated_with_product(person, product, 'driver')
+
+    def test_no_product_security_contact_affiliation(self):
+        # A person who is the security contact for a product is is not
+        # affiliated for simple product affiliation checks.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct(security_contact=person)
+        self.assertIs(
+            None, IHasAffiliation(product).getAffiliationBadge(person))
+
+    def test_no_product_bug_supervisor_affiliation(self):
+        # A person who is the bug supervisor for a product is is not
+        # affiliated for simple product affiliation checks.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct(bug_supervisor=person)
+        self.assertIs(
+            None, IHasAffiliation(product).getAffiliationBadge(person))
+
+    def test_product_owner_affiliation(self):
+        # A person who owns a product is affiliated.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct(owner=person, name='pting')
+        self._check_affiliated_with_product(person, product, 'maintainer')
+
+
+class TestBugTaskPillarAffiliation(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_correct_pillar_is_used(self):
+        bugtask = self.factory.makeBugTask()
+        badge = IHasAffiliation(bugtask)
+        self.assertEqual(bugtask.pillar, badge.getPillar())
+
+    def _check_affiliated_with_distro(self, person, target, role):
+        bugtask = self.factory.makeBugTask(target=target)
+        badge = IHasAffiliation(bugtask).getAffiliationBadge(person)
+        self.assertEqual(
+            ("/@@/distribution-badge", "Pting %s" % role), badge)
+
+    def _check_affiliated_with_product(self, person, target, role):
+        bugtask = self.factory.makeBugTask(target=target)
+        badge = IHasAffiliation(bugtask).getAffiliationBadge(person)
+        self.assertEqual(
+            ("/@@/product-badge", "Pting %s" % role), badge)
+
+    def test_distro_security_contact_affiliation(self):
+        # A person who is the security contact for a distro is affiliated.
         person = self.factory.makePerson()
         distro = self.factory.makeDistribution(
             security_contact=person, name='pting')
         self._check_affiliated_with_distro(person, distro, 'security contact')
 
-    def test_bugtask_distro_bug_supervisor_affiliation(self):
-        # A person who is the bug supervisor for a bugtask distro is
-        # affiliated.
+    def test_distro_bug_supervisor_affiliation(self):
+        # A person who is the bug supervisor for a distro is affiliated.
         person = self.factory.makePerson()
         distro = self.factory.makeDistribution(
             bug_supervisor=person, name='pting')
         self._check_affiliated_with_distro(person, distro, 'bug supervisor')
 
-    def _check_affiliated_with_product(self, person, product, role):
-        bugtask = self.factory.makeBugTask(target=product)
->>>>>>> MERGE-SOURCE
-        badge = IHasAffiliation(bugtask).getAffiliationBadge(person)
-        self.assertEqual(
-<<<<<<< TREE
-            badge, ("/@@/distribution-badge", "Affiliated with Pting"))
-
-    def test_bugtask_product_affiliation(self):
-=======
-            badge, ("/@@/product-badge", "Pting %s" % role))
-
-    def test_bugtask_product_driver_affiliation(self):
-        # A person who is the driver for a bugtask product is affiliated.
-        person = self.factory.makePerson()
-        product = self.factory.makeProduct(driver=person, name='pting')
-        self._check_affiliated_with_product(person, product, 'driver')
-
-    def test_bugtask_product_security_contact_affiliation(self):
-        # A person who is the security contact for a bugtask product is
-        # affiliated.
+    def test_product_security_contact_affiliation(self):
+        # A person who is the security contact for a distro is affiliated.
         person = self.factory.makePerson()
         product = self.factory.makeProduct(
             security_contact=person, name='pting')
-        self._check_affiliated_with_product(
-            person, product, 'security contact')
+        self._check_affiliated_with_product(person, product, 'security contact')
 
-    def test_bugtask_product_bug_supervisor_affiliation(self):
-        # A person who is the bug supervisor for a bugtask product is
-        # affiliated.
+    def test_product_bug_supervisor_affiliation(self):
+        # A person who is the bug supervisor for a distro is affiliated.
         person = self.factory.makePerson()
         product = self.factory.makeProduct(
             bug_supervisor=person, name='pting')
         self._check_affiliated_with_product(person, product, 'bug supervisor')
 
-    def test_bugtask_product_owner_affiliation(self):
->>>>>>> MERGE-SOURCE
-        # A person who owns a bugtask product is affiliated.
-        person = self.factory.makePerson()
-<<<<<<< TREE
-        product = self.factory.makeProduct(owner=person, name='pting')
-=======
-        product = self.factory.makeProduct(owner=person, name='pting')
-        self._check_affiliated_with_product(person, product, 'maintainer')
-
-    def test_bugtask_product_affiliation_query_count(self):
+    def test_product_affiliation_query_count(self):
         # Only 4 queries are expected, selects from:
         # - Bug, BugTask, Product, Person
         person = self.factory.makePerson()
         product = self.factory.makeProduct(owner=person, name='pting')
->>>>>>> MERGE-SOURCE
         bugtask = self.factory.makeBugTask(target=product)
-<<<<<<< TREE
-        badge = IHasAffiliation(bugtask).getAffiliationBadge(person)
-        self.assertEqual(
-            badge, ("/@@/product-badge", "Affiliated with Pting"))
-=======
         Store.of(bugtask).invalidate()
         with StormStatementRecorder() as recorder:
             IHasAffiliation(bugtask).getAffiliationBadge(person)
         self.assertThat(recorder, HasQueryCount(Equals(4)))
 
-    def test_bugtask_distro_affiliation_query_count(self):
+    def test_distro_affiliation_query_count(self):
         # Only 4 queries are expected, selects from:
         # - Bug, BugTask, Distribution, Person
         person = self.factory.makePerson()
@@ -122,4 +183,225 @@
         with StormStatementRecorder() as recorder:
             IHasAffiliation(bugtask).getAffiliationBadge(person)
         self.assertThat(recorder, HasQueryCount(Equals(4)))
->>>>>>> MERGE-SOURCE
+
+
+class TestDistroSeriesPillarAffiliation(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_correct_pillar_is_used(self):
+        series = self.factory.makeDistroSeries()
+        badge = IHasAffiliation(series)
+        self.assertEqual(series.distribution, badge.getPillar())
+
+    def test_driver_affiliation(self):
+        # A person who is the driver for a distroseries is affiliated.
+        # Here, the affiliation is with the distribution of the series.
+        owner = self.factory.makePerson()
+        driver = self.factory.makePerson()
+        distribution = self.factory.makeDistribution(
+            owner=owner, driver=driver, name='pting')
+        distroseries = self.factory.makeDistroSeries(
+            registrant=driver, distribution=distribution)
+        badge = IHasAffiliation(distroseries).getAffiliationBadge(driver)
+        self.assertEqual(
+            ("/@@/distribution-badge", "Pting driver"), badge)
+
+    def test_distro_driver_affiliation(self):
+        # A person who is the driver for a distroseries' distro is affiliated.
+        # Here, the affiliation is with the distribution of the series.
+        owner = self.factory.makePerson()
+        driver = self.factory.makePerson()
+        distribution = self.factory.makeDistribution(
+            owner=owner, driver=driver, name='pting')
+        distroseries = self.factory.makeDistroSeries(
+            registrant=owner, distribution=distribution)
+        badge = IHasAffiliation(distroseries).getAffiliationBadge(driver)
+        self.assertEqual(
+            ("/@@/distribution-badge", "Pting driver"), badge)
+
+
+class TestProductSeriesPillarAffiliation(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_correct_pillar_is_used(self):
+        series = self.factory.makeProductSeries()
+        badge = IHasAffiliation(series)
+        self.assertEqual(series.product, badge.getPillar())
+
+    def test_driver_affiliation(self):
+        # A person who is the driver for a productseries is affiliated.
+        # Here, the affiliation is with the product.
+        owner = self.factory.makePerson()
+        driver = self.factory.makePerson()
+        product = self.factory.makeProduct(
+            owner=owner, driver=driver, name='pting')
+        productseries = self.factory.makeProductSeries(
+            owner=driver, product=product)
+        badge = IHasAffiliation(productseries).getAffiliationBadge(driver)
+        self.assertEqual(
+            ("/@@/product-badge", "Pting driver"), badge)
+
+    def test_product_driver_affiliation(self):
+        # A person who is the driver for a productseries' product is
+        # affiliated. Here, the affiliation is with the product.
+        owner = self.factory.makePerson()
+        driver = self.factory.makePerson()
+        product = self.factory.makeProduct(
+            owner=owner, driver=driver, name='pting')
+        productseries = self.factory.makeProductSeries(
+            owner=owner, product=product)
+        badge = IHasAffiliation(productseries).getAffiliationBadge(driver)
+        self.assertEqual(
+            ("/@@/product-badge", "Pting driver"), badge)
+
+    def test_product_group_driver_affiliation(self):
+        # A person who is the driver for a productseries' product's group is
+        # affiliated. Here, the affiliation is with the product.
+        owner = self.factory.makePerson()
+        driver = self.factory.makePerson()
+        project = self.factory.makeProject(driver=driver)
+        product = self.factory.makeProduct(
+            owner=owner, project=project, name='pting')
+        productseries = self.factory.makeProductSeries(
+            owner=owner, product=product)
+        badge = IHasAffiliation(productseries).getAffiliationBadge(driver)
+        self.assertEqual(
+            ("/@@/product-badge", "Pting driver"), badge)
+
+
+class TestQuestionPillarAffiliation(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_correct_pillar_is_used_for_product(self):
+        product = self.factory.makeProduct()
+        question = self.factory.makeQuestion(target=product)
+        badge = IHasAffiliation(question)
+        self.assertEqual(question.product, badge.getPillar())
+
+    def test_correct_pillar_is_used_for_distribution(self):
+        distribution = self.factory.makeDistribution()
+        question = self.factory.makeQuestion(target=distribution)
+        badge = IHasAffiliation(question)
+        self.assertEqual(question.distribution, badge.getPillar())
+
+    def test_correct_pillar_is_used_for_distro_sourcepackage(self):
+        distribution = self.factory.makeDistribution()
+        distro_sourcepackage = self.factory.makeDistributionSourcePackage(
+            distribution=distribution)
+        owner = self.factory.makePerson()
+        question = self.factory.makeQuestion(
+            target=distro_sourcepackage, owner=owner)
+        badge = IHasAffiliation(question)
+        self.assertEqual(distribution, badge.getPillar())
+
+    def test_answer_contact_affiliation_for_distro(self):
+        # A person is affiliated if they are an answer contact for a distro
+        # target. Even if they also own the distro, the answer contact
+        # affiliation takes precedence.
+        answer_contact = self.factory.makePerson()
+        english = getUtility(ILanguageSet)['en']
+        answer_contact.addLanguage(english)
+        distro = self.factory.makeDistribution(owner=answer_contact)
+        with person_logged_in(answer_contact):
+            distro.addAnswerContact(answer_contact, answer_contact)
+        question = self.factory.makeQuestion(target=distro)
+        badge = IHasAffiliation(question).getAffiliationBadge(answer_contact)
+        self.assertEqual(
+            ("/@@/distribution-badge", "%s answer contact" %
+                distro.displayname), badge)
+
+    def test_answer_contact_affiliation_for_distro_sourcepackage(self):
+        # A person is affiliated if they are an answer contact for a dsp
+        # target. Even if they also own the distro, the answer contact
+        # affiliation takes precedence.
+        answer_contact = self.factory.makePerson()
+        english = getUtility(ILanguageSet)['en']
+        answer_contact.addLanguage(english)
+        distribution = self.factory.makeDistribution(owner=answer_contact)
+        distro_sourcepackage = self.factory.makeDistributionSourcePackage(
+            distribution=distribution)
+        with person_logged_in(answer_contact):
+            distro_sourcepackage.addAnswerContact(
+                answer_contact, answer_contact)
+        question = self.factory.makeQuestion(
+            target=distro_sourcepackage, owner=answer_contact)
+        badge = IHasAffiliation(question).getAffiliationBadge(answer_contact)
+        self.assertEqual(
+            ("/@@/distribution-badge", "%s answer contact" %
+                distro_sourcepackage.displayname), badge)
+
+    def test_answer_contact_affiliation_for_product(self):
+        # A person is affiliated if they are an answer contact for a product
+        # target. Even if they also own the product, the answer contact
+        # affiliation takes precedence.
+        answer_contact = self.factory.makePerson()
+        english = getUtility(ILanguageSet)['en']
+        answer_contact.addLanguage(english)
+        product = self.factory.makeProduct(owner=answer_contact)
+        with person_logged_in(answer_contact):
+            product.addAnswerContact(answer_contact, answer_contact)
+        question = self.factory.makeQuestion(target=product)
+        badge = IHasAffiliation(question).getAffiliationBadge(answer_contact)
+        self.assertEqual(
+            ("/@@/product-badge", "%s answer contact" %
+                product.displayname), badge)
+
+    def test_product_affiliation(self):
+        # A person is affiliated if they are affiliated with the product.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct(owner=person)
+        question = self.factory.makeQuestion(target=product)
+        badge = IHasAffiliation(question).getAffiliationBadge(person)
+        self.assertEqual(
+            ("/@@/product-badge", "%s maintainer" %
+                product.displayname), badge)
+
+    def test_distribution_affiliation(self):
+        # A person is affiliated if they are affiliated with the distribution.
+        person = self.factory.makePerson()
+        distro = self.factory.makeDistribution(owner=person)
+        question = self.factory.makeQuestion(target=distro)
+        badge = IHasAffiliation(question).getAffiliationBadge(person)
+        self.assertEqual(
+            ("/@@/distribution-badge", "%s maintainer" %
+                distro.displayname), badge)
+
+
+class TestSpecificationPillarAffiliation(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_correct_pillar_is_used_for_product(self):
+        product = self.factory.makeProduct()
+        specification = self.factory.makeSpecification(product=product)
+        badge = IHasAffiliation(specification)
+        self.assertEqual(specification.product, badge.getPillar())
+
+    def test_correct_pillar_is_used_for_distribution(self):
+        distro = self.factory.makeDistribution()
+        specification = self.factory.makeSpecification(distribution=distro)
+        badge = IHasAffiliation(specification)
+        self.assertEqual(specification.distribution, badge.getPillar())
+
+    def test_product_affiliation(self):
+        # A person is affiliated if they are affiliated with the pillar.
+        person = self.factory.makePerson()
+        product = self.factory.makeProduct(owner=person)
+        specification = self.factory.makeSpecification(product=product)
+        badge = IHasAffiliation(specification).getAffiliationBadge(person)
+        self.assertEqual(
+            ("/@@/product-badge", "%s maintainer" %
+                product.displayname), badge)
+
+    def test_distribution_affiliation(self):
+        # A person is affiliated if they are affiliated with the distribution.
+        person = self.factory.makePerson()
+        distro = self.factory.makeDistribution(owner=person)
+        specification = self.factory.makeSpecification(distribution=distro)
+        badge = IHasAffiliation(specification).getAffiliationBadge(person)
+        self.assertEqual(
+            ("/@@/distribution-badge", "%s maintainer" %
+                distro.displayname), badge)
 
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2011-08-05 04:51:58 +0000
+++ lib/lp/testing/factory.py	2011-08-05 04:51:59 +0000
@@ -1025,7 +1025,7 @@
         return ProxyFactory(series)
 
     def makeProject(self, name=None, displayname=None, title=None,
-                    homepageurl=None, summary=None, owner=None,
+                    homepageurl=None, summary=None, owner=None, driver=None,
                     description=None):
         """Create and return a new, arbitrary ProjectGroup."""
         if owner is None:
@@ -1040,7 +1040,7 @@
             description = self.getUniqueString('description')
         if title is None:
             title = self.getUniqueString('title')
-        return getUtility(IProjectGroupSet).new(
+        project = getUtility(IProjectGroupSet).new(
             name=name,
             displayname=displayname,
             title=title,
@@ -1048,6 +1048,9 @@
             summary=summary,
             description=description,
             owner=owner)
+        if driver is not None:
+            removeSecurityProxy(project).driver = driver
+        return project
 
     def makeSprint(self, title=None, name=None):
         """Make a sprint."""
@@ -2326,7 +2329,7 @@
 
     def makeDistribution(self, name=None, displayname=None, owner=None,
                          registrant=None, members=None, title=None,
-                         aliases=None, bug_supervisor=None,
+                         aliases=None, bug_supervisor=None, driver=None,
                          security_contact=None, publish_root_dir=None,
                          publish_base_url=None, publish_copy_base_url=None,
                          no_pubconf=False):
@@ -2352,6 +2355,8 @@
         naked_distro = removeSecurityProxy(distro)
         if aliases is not None:
             naked_distro.setAliases(aliases)
+        if driver is not None:
+            naked_distro.driver = driver
         if bug_supervisor is not None:
             naked_distro.bug_supervisor = bug_supervisor
         if security_contact is not None: