Merge lp://staging/~wallyworld/launchpad/improve-personpicker-bugtaskaffiliation-798764 into lp://staging/launchpad

> === modified file 'lib/lp/registry/model/pillaraffiliation.py'
> --- lib/lp/registry/model/pillaraffiliation.py 2011-08-03 06:34:41 +0000
> +++ lib/lp/registry/model/pillaraffiliation.py 2011-08-03 06:34:43 +0000
> @@ -72,7 +75,20 @@
>
> def getAffiliationBadge(self, person):
> pillar = self.context.pillar
> - affiliated = person.inTeam(pillar.owner)
> + 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 = (person.inTeam(pillar.owner) or
> + person.inTeam(bug_supervisor) or
> + person.inTeam(security_contact) or
> + person.inTeam(driver))

Check driver before bug_supervisor. It is a often a larger group and more
important for all Lp applications. bug_supervisor and security_contact are
primarilly about private bugs and security bugs.

> === modified file 'lib/lp/registry/tests/test_pillaraffiliation.py'
> --- lib/lp/registry/tests/test_pillaraffiliation.py 2011-08-03 06:34:41 +0000
> +++ lib/lp/registry/tests/test_pillaraffiliation.py 2011-08-03 06:34:43 +0000
..
> +class TestBugTaskPillarAffiliation(TestCaseWithFactory):
>
> layer = DatabaseFunctionalLayer
>
> - def test_bugtask_distro_affiliation(self):
> + def _check_affiliated_with_distro(self, person, distro):
> + bugtask = self.factory.makeBugTask(target=distro)
> + badge = IHasAffiliation(bugtask).getAffiliationBadge(person)
> + self.assertEqual(
> + badge, ("/@@/distribution-badge", "Affiliated with Pting"))

Users wanted to know *how* the user was affilliated. Is the user the
maintainer or the bug_supervisor. This branch does not address this concern.
Were you planning to addess this in a future branch?

Maybe we could change the badge text to state the role?
getAffiliationBadge() could return the role of the successful test and that
is used to make the alt text that will also be shown in the expanded details.

        affilliated = None
        if person.inTeam(pillar.owner):
            affilliated = 'maintainer'
        elif person.inTeam(driver):
            affilliated = 'driver'
        elif person.inTeam(bug_supervisor):
            affilliated = 'bug supervisor'
        elif person.inTeam(security_contact):
            affilliated = 'security contact'

        if not affiliated:
            return None
        alt_text = "%s %s" % (pillar.displayname, affiliated)

So the picker would show that both of us as:
    Launchpad maintainer

>
> Users wanted to know *how* the user was affilliated. Is the user the
> maintainer or the bug_supervisor. This branch does not address this concern.
> Were you planning to addess this in a future branch?
>
> Maybe we could change the badge text to state the role?
> getAffiliationBadge() could return the role of the successful test and that
> is used to make the alt text that will also be shown in the expanded details.
>
> affilliated = None
> if person.inTeam(pillar.owner):
> affilliated = 'maintainer'
> elif person.inTeam(driver):
> affilliated = 'driver'
> elif person.inTeam(bug_supervisor):
> affilliated = 'bug supervisor'
> elif person.inTeam(security_contact):
> affilliated = 'security contact'
>
> if not affiliated:
> return None
> alt_text = "%s %s" % (pillar.displayname, affiliated)
>
> So the picker would show that both of us as:
> Launchpad maintainer

Ah, I fail. Thanks for picking this up. I also like the suggested
implementation. I'll make the changes.

Thank you for the update.