Merge lp:~bryce/launchpad/lp-617695-linkui into lp:launchpad/db-devel

[Bryce Harrington]

Implements UI for displaying components registered at a remote bug tracker, and UI for linking a distro source package to a component.

This branch contains the UI changes to implement display of components and component groups (products) available from a given bug tracker, along with an edit form for linking components to particular source packages.

A preimplementation call was done with Deryck about the design and implementation of the ui and code. He also gave some advice on the tests while we were at UDS.

Lint issues have been checked and fixed.

I test this using the command:

  ./bin/test -t browser.*bugtracker_component

I've also run this through ec2 test. The test run failed due to windmill issues; but, these failures seem unrelated to my branch.

[Steve Kowalik (stevenk)]

Hi Bryce,

Thanks for the excellent work! I only have one comment, which is the unittest machinery in the unittest and the import of unittest isn't needed.

review: Approve (code*)

[Tim Penhey (thumper)]

Why assume ubuntu as the distributions? Do we need to define the distribution at all? Surely the sourcepackagename itself is enough?

Also as a general rule, we should be doing as little as possible in the view code, so the code to link the component to the sourcepackage should really go in the bugtracker code. Warning bells went off when you overloaded updateContextFromData.

review: Needs Information

[Steve Kowalik (stevenk)]

Bryce is right, SPN isn't enough, since likely the same package exists in Debian, which why I didn't question that bit.

[Bryce Harrington (bryce)]

SteveK, thanks I'll look into dropping the unittest stuff.

Tim, yeah the SPN is used to manually construct a distribution_source_package object, which requires having a distribution object. Unfortunately since the user is coming in off the bugtracker page there is (afaik) no context to auto-magically discern what distro they're on. The only ideas I had got to be comically hard or would impose silly UI on the user (like a dropdown with all distros to choose from, even though only 1 distro makes any sense to choose).

But yeah, I can move the linking code into the model. I'd considered that but opted to be lazy. ;-)

[Curtis Hovey (sinzui)]

Hi Bryce.

How do I see this feature? I added (default, 0, bugtracker_components, on) to launchpad_dev and I do not see your portlet added to the bugtracker page.

[Tim Penhey (thumper)]

The point that I was trying to make is that a component relates to a source package. By that I mean something like "gstreamer". It doesn't really matter that source package is in ubuntu / debian / distroX (to me), if the component relates to the package "gstreamer" then surely that should be enough.

I wasn't challenging the design of our "SourcePackage" object. Only trying to understand what we are fundamentally trying to model.

[Bryce Harrington (bryce)]

@Curtis, running cronscripts/update-bugzilla-remote-components.py will fill your local database with bugzilla components and give you a good visual of what the UI will look like in practice.

For manual reviewing of the UI elements, after I ran that to download the gnome bugzilla data, I configured alsa-utils as using the gnome bug tracker as its upstream tracker, and linked one of the gnome packages like zenity to verify the linking behavior was right.

[Bryce Harrington (bryce)]

@Tim, I've promoted the Store code from the browser to a proper interface routine, and generalized it a bit so it'll be useful in and of itself. The remaining code in updateContextFromData() seems harder to abstract away, since it'd make the error messages less meaningful. Note that the code that actually does the linking is already implemented in the model as a setter routine. If you think more of the code could be moved out of browser, I'm open to your recommendations.

Regarding the distro source package complexity, yeah I get what you mean and I agree linking to a 'source package' object directly would be a cleaner design. A source package is going to be linked to the same component regardless of the distribution, and it would be better if we could model it without referencing distros at all. However, the way source packages are implemented in launchpad is kind of wonky. There isn't really a 'source package' database table and storm object that this could be hung off of. There *is* a source_package element in the API, so you would think you could link to that, however:

<deryck> bryceh, no, it's ISourcePackage, which is poorly named. That's the package in a distro series.
<deryck> bryceh, so you're only options are to hang this on either SourcePackage (distro series) or DistributionSourcePackage (distro) and the later seems right.
 bryceh, right
 bryceh, sourcepackagename is just table magic really to enable re-use of names across distros.
 bryceh, but you can't really link to it the same way as the other objects. You could, but it's not really used the same way as the other objects.
...
<deryck> bryceh, so you've done it right. DSP is actually the distro source package, as the name suggests, [while] SP would be better named "distro series source package."

[Bryce Harrington (bryce)]

Hey, just noticed this branch is still not merged, although there's been no further review comments since my last one. Is there anything still needing done here? Looks like it got stalled out in review...

With me back on the distro team my time's rather short, so if anyone could shepherd this the rest of the way into launchpad it'd be really appreciated.

(I don't really need this UI for my own purposes, I just use the API, but would be nice to have this feature for other folks in general.)

review: Needs Resubmitting

[Bryce Harrington (bryce)]

Hello? Anyone?

[Curtis Hovey (sinzui)]

Hi Bryce.

I apologise for not following up on this. I will do the code/UI review in a few hours.

[Tim Penhey (thumper)]

With me now out of the LP team, I'll leave this to SteveK to do with as he likes.

review: Abstain

[Curtis Hovey (sinzui)]

> === modified file 'lib/canonical/widgets/bugtask.py'
Hi Bryce.

I have some questions about some of the methods and properties. I have some suggestions that I think you can make in less than an hour to improve this branch.

> --- lib/canonical/widgets/bugtask.py 2010-11-08 12:52:43 +0000
> +++ lib/canonical/widgets/bugtask.py 2010-12-03 23:48:54 +0000

I think you need to remerge. This module was moved about 4 months ago. I
expect this to be lp/bugs/browser/widgets/bugtask.py. I see conflicts too.

> @@ -495,6 +495,25 @@
> return distribution
>
>
> +class UbuntuSourcePackageNameWidget(
> + BugTaskSourcePackageNameWidget):
> + """Package widget where the distribution can be assumed as Ubuntu
> +
> + This widgets works the same as `BugTaskSourcePackageNameWidget`,
> + except that it assumes the distribution is 'ubuntu'.
> + """
> + distribution_name = "ubuntu"
> +
> + def getDistribution(self):
> + """See `BugTaskSourcePackageNameWidget`"""
> + distribution = getUtility(IDistributionSet).getByName(
> + self.distribution_name)
> + if distribution is None:
> + raise UnexpectedFormData(
> + "No such distribution: %s" % self.distribution_name)
> + return distribution

I think this could be expressed differently. We are not /assuming/ that
the distro is Ubuntu, it is. To ensure it is this, the whole class would
look like:

class UbuntuSourcePackageNameWidget(BugTaskSourcePackageNameWidget):
    """A widget to select Ubuntu packages."""

    def getDistribution(self):
        """See `BugTaskSourcePackageNameWidget`"""
        return getUtility(ILaunchpadCelebrities).ubuntu

> === modified file 'lib/lp/bugs/browser/bugtracker.py'
> --- lib/lp/bugs/browser/bugtracker.py 2010-11-23 23:22:27 +0000
> +++ lib/lp/bugs/browser/bugtracker.py 2010-12-03 23:48:54 +0000
> ...
> @@ -231,6 +237,14 @@
> return shortlist(chain(self.context.projects,
> self.context.products), 100)
>
> + @property
> + def related_component_groups(self):
> + """Return all component groups and components
> +
> + This property was created for the Related components portlet in
> + the bug tracker's page.
> + """
> + return self.context.getAllRemoteComponentGroups()

Properties docstring do avoid "return" because they are not intended to be
methods. The call site is not interesting. The docstring could be.

        """All component groups and components."""

> @@ -449,16 +463,111 @@
...
> +class BugTrackerEditComponentView(LaunchpadEditFormView):
> + """Provides editing form for setting source packages for components.
> +
> + In this class we assume that bug tracker components are always
> + linked to source packages in the Ubuntu distribution.
> + """
> +
> + schema = IBugTrackerComponent
> + custom_widget('sourcepackagename',
> + UbuntuSourcePackageNameWidget)
> +
> + @property
> + def page_title(self):
> + return smartquote(
> + u'Link a distribution source package to the %s component'
> + % self.context.name)

This is an odd breadcrum...

review: Needs Information (code)

[Steve Kowalik (stevenk)]

I think this MP should be re-submitted against devel, I suspect the reasoning for targeting db-devel is long past.

review: Needs Resubmitting

[Bryce Harrington (bryce)]

>> + @property
>> + def page_title(self):
>> + return smartquote(
>> + u'Link a distribution source package to the %s component'
>> + % self.context.name)
>
> This is an odd breadcrumb/page_title. Labels are meant to be verbose,
> while this attribute is meant to be tearse so that it fits in the breadcrumbs:
>
> Bug trackers > AbiSource bug tracker > Link component

I don't understand this review comment. I modeled the page_title for this off of the BugTrackerEditView classes' page_title() which looks like this:

    @property
    def page_title(self):
        return smartquote(
            u'Change details for the "%s" bug tracker' % self.context.title)

Can you elaborate on how you think it should be worded?

[Curtis Hovey (sinzui)]

Oh no! I did not see any activity on this. I pulled the branch down and have is all cleaned up. I still cannot see the UI. My branch based on yours is
    lp:~sinzui/launchpad/remote-bugtracker-components-ui-0

You can see my commits are only hours ahead of yours.

Lets talk about this.

[Bryce Harrington (bryce)]

Regarding viewing the UI:

For manual testing of this feature locally, I first ran cronscripts/update-bugzilla-remote-components.py to populate the mozilla and gnome bugzillas instances in the sample data.

Next, I configured the alsa-utils project as using the gnome bugzilla, at https://bugs.launchpad.dev/alsa-utils/+configure-bugtracker by selecting "In a registered bug tracker" and typing in "gnome-bugs"; for the field "Project ID in bug tracker" I typed in "zenity" just to pick a random existing project.

Navigating to https://bugs.launchpad.dev/bugs/bugtrackers/gnome-bugs I scrolled down to the end and under the 'zenity' component group I clicked the icon next to 'general'. On the linking form I specified 'alsa-utils' as the package. I doublechecked that zenity/general now showed a link to 'alsa-utils'.

I logged out, and verified as anonymous that the edit links don't show up on https://bugs.launchpad.dev/bugs/bugtrackers/gnome-bugs.

=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2011-05-31 12:17:52 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2011-06-02 23:32:14 +0000
@@ -624,6 +624,9 @@
     IBugTracker, 'addRemoteComponentGroup', IBugTrackerComponentGroup)
 patch_collection_return_type(
     IBugTracker, 'getAllRemoteComponentGroups', IBugTrackerComponentGroup)
+patch_entry_return_type(
+    IBugTracker, 'getRemoteComponentForDistroSourcePackage',
+    IBugTrackerComponent)
 
 ## IBugTrackerComponent
 patch_reference_property(

=== modified file 'lib/canonical/launchpad/scripts/bzremotecomponentfinder.py'
--- lib/canonical/launchpad/scripts/bzremotecomponentfinder.py	2010-12-20 03:21:03 +0000
+++ lib/canonical/launchpad/scripts/bzremotecomponentfinder.py	2011-06-02 23:32:14 +0000
@@ -117,7 +117,6 @@
         self.static_bugzilla_text = static_bugzilla_text
 
     def getRemoteProductsAndComponents(self, bugtracker_name=None):
-        """"""
         lp_bugtrackers = getUtility(IBugTrackerSet)
         if bugtracker_name is not None:
             lp_bugtrackers = [

=== modified file 'lib/lp/bugs/browser/bugtracker.py'
--- lib/lp/bugs/browser/bugtracker.py	2011-05-27 21:12:25 +0000
+++ lib/lp/bugs/browser/bugtracker.py	2011-06-02 23:32:14 +0000
@@ -10,6 +10,7 @@
     'BugTrackerBreadcrumb',
     'BugTrackerComponentGroupNavigation',
     'BugTrackerEditView',
+    'BugTrackerEditComponentView',
     'BugTrackerNavigation',
     'BugTrackerNavigationMenu',
     'BugTrackerSetBreadcrumb',
@@ -56,6 +57,16 @@
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.menu import NavigationMenu
 from canonical.lazr.utils import smartquote
+<<<<<<< TREE
+=======
+from canonical.widgets import (
+    DelimitedListWidget,
+    LaunchpadRadioWidget,
+    )
+from canonical.widgets.bugtask import (
+    UbuntuSourcePackageNameWidget,
+    )
+>>>>>>> MERGE-SOURCE
 from lp.app.browser.launchpadform import (
     action,
     custom_widget,
@@ -71,7 +82,13 @@
     IBugTrackerComponentGroup,
     IBugTrackerSet,
     IRemoteBug,
+<<<<<<< TREE
+=======
+    IBugTrackerComponent,
+    IBugTrackerComponentGroup,
+>>>>>>> MERGE-SOURCE
     )
+from lp.registry.interfaces.distribution import IDistributionSet
 from lp.services.propertycache import cachedproperty
 
 # A set of bug tracker types for which there can only ever be one bug
@@ -227,6 +244,11 @@
         return shortlist(chain(self.context.projects,
                                self.context.products), 100)
 
+    @property
+    def related_component_groups(self):
+        """All component groups and components."""
+        return self.context.getAllRemoteComponentGroups()
+
 
 BUG_TRACKER_ACTIVE_VOCABULARY = SimpleVocabulary.fromItems(
     [('On', True), ('Off', False)])
@@ -445,16 +467,93 @@
             return RemoteBug(self.context, remotebug, bugs)
 
     @stepthrough("+components")
-    def component_groups(self, name):
-        return self.context.getRemoteComponentGroup(name)
+    def component_groups(self, id):
+        # Navigate by id (component group name should work too)
+        return self.context.getRemoteComponentGroup(id)
+
+
+class BugTrackerEditComponentView(LaunchpadEditFormView):
+    """Provides editing form for setting source packages for components.
+
+    In this class we assume that bug tracker components are always
+    linked to source packages in the Ubuntu distribution.
+    """
+
+    schema = IBugTrackerComponent
+    custom_widget('sourcepackagename',
+                  UbuntuSourcePackageNameWidget)
+
+    @property
+    def page_title(self):
+        return smartquote(
+            u'Link a distribution source package to the %s component'
+            % self.context.name)
+
+    @property
+    def field_names(self):
+        field_names = ['sourcepackagename']
+        return field_names
+
+    @property
+    def initial_values(self):
+        """See `LaunchpadFormView.`"""
+        field_values = {}
+        for name in self.field_names:
+            if name == 'sourcepackagename':
+                pkg = self.context.distro_source_package
+                if pkg is not None:
+                    field_values['sourcepackagename'] = pkg.name
+                else:
+                    field_values['sourcepackagename'] = ""
+            else:
+                field_values[name] = getattr(self.context, name)
+
+        return field_values
+
+    def updateContextFromData(self, data, context=None):
+        """Link component to specified distro source package.
+
+        Get the user-provided source package name from the form widget,
+        look it up in Ubuntu to retrieve the distro_source_package
+        object, and link it to this component.
+        """
+        component = context or self.context
+        sourcepackagename = data['sourcepackagename']
+        distribution = self.widgets['sourcepackagename'].getDistribution()
+        dsp = distribution.getSourcePackage(sourcepackagename)
+        bug_tracker = self.context.component_group.bug_tracker
+
+        # Has this source package already been assigned to a component?
+        link_comp = bug_tracker.getRemoteComponentForDistroSourcePackageName(
+            distribution, sourcepackagename)
+        if link_comp is not None:
+            self.request.response.addNotification(
+                "The %s source package is already linked to %s:%s in %s" %(
+                    sourcepackagename.name, link_comp.component_group.name,
+                    link_comp.name, distribution.name))
+            return
+
+        component.distro_source_package = dsp
+        self.request.response.addNotification(
+            "%s:%s is now linked to the %s source package in %s" %(
+                component.component_group.name, component.name,
+                sourcepackagename.name, distribution.name))
+
+    @action('Save Changes', name='save')
+    def save_action(self, action, data):
+        """Update the component with the form data."""
+        self.updateContextFromData(data)
+
+        self.next_url = canonical_url(
+            self.context.component_group.bug_tracker)
 
 
 class BugTrackerComponentGroupNavigation(Navigation):
 
     usedfor = IBugTrackerComponentGroup
 
-    def traverse(self, name):
-        return self.context.getComponent(name)
+    def traverse(self, id):
+        return self.context.getComponent(id)
 
 
 class BugTrackerSetBreadcrumb(Breadcrumb):

=== modified file 'lib/lp/bugs/browser/configure.zcml'
--- lib/lp/bugs/browser/configure.zcml	2011-05-29 21:18:09 +0000
+++ lib/lp/bugs/browser/configure.zcml	2011-06-02 23:32:14 +0000
@@ -819,6 +819,12 @@
             path_expression="name"
             attribute_to_parent="component_group"
             rootsite="bugs"/>
+        <browser:page
+            name="+edit"
+            for="lp.bugs.interfaces.bugtracker.IBugTrackerComponent"
+            class="lp.bugs.browser.bugtracker.BugTrackerEditComponentView"
+            permission="launchpad.AnyPerson"
+            template="../../app/templates/generic-edit.pt"/>
         <browser:pages
             for="lp.bugs.interfaces.bugtracker.IBugTracker"
             class="lp.bugs.browser.bugtracker.BugTrackerView"
@@ -830,6 +836,9 @@
                 name="+portlet-details"
                 template="../templates/bugtracker-portlet-details.pt"/>
             <browser:page
+                name="+portlet-components"
+                template="../templates/bugtracker-portlet-components.pt"/>
+            <browser:page
                 name="+portlet-projects"
                 template="../templates/bugtracker-portlet-projects.pt"/>
             <browser:page

=== added file 'lib/lp/bugs/browser/tests/test_bugtracker_component.py'
--- lib/lp/bugs/browser/tests/test_bugtracker_component.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/browser/tests/test_bugtracker_component.py	2011-06-02 23:32:14 +0000
@@ -0,0 +1,105 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version (see the file LICENSE).
+
+"""Unit tests for linking bug tracker components to source packages."""
+
+__metaclass__ = type
+
+from zope.component import getUtility
+
+from canonical.testing.layers import DatabaseFunctionalLayer
+from lp.registry.interfaces.distribution import IDistributionSet
+from lp.testing import (
+    login_person,
+    TestCaseWithFactory,
+    )
+from lp.testing.views import create_initialized_view
+
+
+class TestBugTrackerEditComponentView(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(TestBugTrackerEditComponentView, self).setUp()
+        regular_user = self.factory.makePerson()
+        login_person(regular_user)
+
+        self.bug_tracker = self.factory.makeBugTracker()
+        self.comp_group = self.factory.makeBugTrackerComponentGroup(
+            u'alpha', self.bug_tracker)
+
+    def _makeForm(self, sourcepackage):
+        if sourcepackage is None:
+            name = ''
+        else:
+            name = sourcepackage.name
+        return {
+            'field.sourcepackagename': name,
+            'field.actions.save': 'Save',
+            }
+
+    def test_view_attributes(self):
+        component = self.factory.makeBugTrackerComponent(
+            u'Example', self.comp_group)
+        distro = getUtility(IDistributionSet).getByName('ubuntu')
+        package = self.factory.makeDistributionSourcePackage(
+            sourcepackagename='example', distribution=distro)
+        form = self._makeForm(package)
+        view = create_initialized_view(
+            component, name='+edit', form=form)
+        label = 'Link a distribution source package to the Example component'
+        self.assertEqual(label, view.page_title)
+        fields = ['sourcepackagename']
+        self.assertEqual(fields, view.field_names)
+
+    def test_linking(self):
+        component = self.factory.makeBugTrackerComponent(
+            u'Example', self.comp_group)
+        distro = getUtility(IDistributionSet).getByName('ubuntu')
+        package = self.factory.makeDistributionSourcePackage(
+            sourcepackagename='example', distribution=distro)
+
+        self.assertIs(None, component.distro_source_package)
+        form = self._makeForm(package)
+        view = create_initialized_view(
+            component, name='+edit', form=form)
+        self.assertEqual([], view.errors)
+
+        notifications = view.request.response.notifications
+        #self.assertEqual(1, len(notifications))
+        self.assertEqual(component.distro_source_package, package)
+        expected = (
+            u"alpha:Example is now linked to the example "
+            "source package in ubuntu")
+        self.assertEqual(expected, notifications.pop().message)
+
+    def test_cannot_doublelink_sourcepackages(self):
+        # Two components try linking to same package
+        component_a = self.factory.makeBugTrackerComponent(
+            u'a', self.comp_group)
+        component_b = self.factory.makeBugTrackerComponent(
+            u'b', self.comp_group)
+        distro = getUtility(IDistributionSet).getByName('ubuntu')
+        package = self.factory.makeDistributionSourcePackage(
+            sourcepackagename='example', distribution=distro)
+
+        form = self._makeForm(package)
+        view = create_initialized_view(
+            component_a, name='+edit', form=form)
+        notifications = view.request.response.notifications
+        self.assertEqual([], view.errors)
+        self.assertEqual(1, len(notifications))
+        self.assertEqual(package, component_a.distro_source_package)
+
+        form = self._makeForm(package)
+        view = create_initialized_view(
+            component_b, name='+edit', form=form)
+        self.assertIs(None, component_b.distro_source_package)
+        self.assertEqual([], view.errors)
+        notifications = view.request.response.notifications
+        self.assertEqual(1, len(notifications))
+        expected = (
+            u"""The example source package is already linked to """
+            """alpha:a in ubuntu""")
+        self.assertEqual(expected, notifications.pop().message)

=== modified file 'lib/lp/bugs/browser/widgets/bugtask.py'
--- lib/lp/bugs/browser/widgets/bugtask.py	2011-02-02 15:43:31 +0000
+++ lib/lp/bugs/browser/widgets/bugtask.py	2011-06-02 23:32:14 +0000
@@ -527,6 +527,13 @@
         return distribution
 
 
+class UbuntuSourcePackageNameWidget(BugTaskSourcePackageNameWidget):
+    """A widget to select Ubuntu packages."""
+    def getDistribution(self):
+        """See `BugTaskSourcePackageNameWidget`"""
+        return getUtility(ILaunchpadCelebrities).ubuntu
+
+
 class AssigneeDisplayWidget(BrowserWidget):
     """A widget for displaying an assignee."""
 

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2011-05-10 15:14:10 +0000
+++ lib/lp/bugs/configure.zcml	2011-06-02 23:32:14 +0000
@@ -394,6 +394,7 @@
                     getBugFilingAndSearchLinks
                     getBugsWatching
                     getLinkedPersonByName
+                    getRemoteComponentForDistroSourcePackageName
                     getRemoteComponentGroup
                     has_lp_plugin
                     id

=== modified file 'lib/lp/bugs/interfaces/bugtracker.py'
--- lib/lp/bugs/interfaces/bugtracker.py	2011-02-23 20:26:53 +0000
+++ lib/lp/bugs/interfaces/bugtracker.py	2011-06-02 23:32:14 +0000
@@ -390,7 +390,8 @@
 
     @operation_parameters(
         component_group_name=TextLine(
-            title=u"The name of the remote component group", required=True))
+            title=u"The name of the remote component group",
+            required=True))
     @operation_returns_entry(Interface)
     @export_read_operation()
     def getRemoteComponentGroup(component_group_name):
@@ -399,6 +400,22 @@
         :param component_group_name: Name of the component group to retrieve.
         """
 
+    @operation_parameters(
+        distro_name=TextLine(
+            title=u"The name of the distribution for the source package",
+            required=True),
+        source_package_name=TextLine(
+            title=u"The name of the source package to look for",
+            required=True))
+    @operation_returns_entry(Interface)
+    @export_read_operation()
+    def getRemoteComponentForDistroSourcePackage(
+        distro_name, source_package_name):
+        """Returns the component linked to this source package, if any.
+
+        If no components have been linked, returns value of None.
+        """
+
 
 class IBugTrackerSet(Interface):
     """A set of IBugTracker's.
@@ -538,6 +555,10 @@
             title=_('Name'),
             description=_("The name of a software component "
                           "as shown in Launchpad.")))
+    sourcepackagename = Choice(
+        title=_("Package"), required=False, vocabulary='SourcePackageName')
+    distribution = Choice(
+        title=_("Distribution"), required=False, vocabulary='Distribution')
 
     distro_source_package = exported(
         Reference(

=== modified file 'lib/lp/bugs/model/bugtracker.py'
--- lib/lp/bugs/model/bugtracker.py	2011-05-28 04:09:11 +0000
+++ lib/lp/bugs/model/bugtracker.py	2011-06-02 23:32:14 +0000
@@ -83,6 +83,7 @@
 from lp.bugs.model.bugmessage import BugMessage
 from lp.bugs.model.bugtrackerperson import BugTrackerPerson
 from lp.bugs.model.bugwatch import BugWatch
+from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import (
     IPersonSet,
     validate_public_person,
@@ -271,10 +272,17 @@
 
         if component_name is None:
             return None
+        elif component_name.isdigit():
+            component_id = int(component_name)
+            return Store.of(self).find(
+                BugTrackerComponent,
+                BugTrackerComponent.id == component_id,
+                BugTrackerComponent.component_group == self.id).one()
         else:
             return Store.of(self).find(
                 BugTrackerComponent,
-                (BugTrackerComponent.name == component_name)).one()
+                BugTrackerComponent.name == component_name,
+                BugTrackerComponent.component_group == self.id).one()
 
     def addCustomComponent(self, component_name):
         """Adds a component locally that isn't synced from a remote tracker
@@ -680,11 +688,27 @@
         """See `IBugTracker`."""
         component_group = None
         store = IStore(BugTrackerComponentGroup)
-        component_group = store.find(
-            BugTrackerComponentGroup,
-            name = component_group_name).one()
+        if component_group_name.isdigit():
+            component_group_id = int(component_group_name)
+            component_group = store.find(
+                BugTrackerComponentGroup,
+                id = component_group_id).one()
+        else:
+            component_group = store.find(
+                BugTrackerComponentGroup,
+                name = component_group_name).one()
         return component_group
 
+    def getRemoteComponentForDistroSourcePackageName(
+        self, distribution, sourcepackagename):
+        """See `IBugTracker`."""
+        pkgs = Store.of(self).find(
+            BugTrackerComponent,
+            BugTrackerComponent.distribution == distribution.id,
+            BugTrackerComponent.source_package_name ==
+            sourcepackagename.id).one()
+        return pkgs[0]
+
 
 class BugTrackerSet:
     """Implements IBugTrackerSet for a container or set of BugTrackers,

=== modified file 'lib/lp/bugs/templates/bugtracker-index.pt'
--- lib/lp/bugs/templates/bugtracker-index.pt	2010-10-10 21:54:16 +0000
+++ lib/lp/bugs/templates/bugtracker-index.pt	2011-06-02 23:32:14 +0000
@@ -34,6 +34,9 @@
     <div class="yui-g">
       <div class="first yui-u">
         <div tal:replace="structure context/@@+portlet-details" />
+        <div tal:condition="features/bugtracker_components">
+          <div tal:replace="structure context/@@+portlet-components" />
+        </div>
       </div>
       <div class="yui-u">
         <div tal:replace="structure context/@@+portlet-projects" />

=== added file 'lib/lp/bugs/templates/bugtracker-portlet-components.pt'
--- lib/lp/bugs/templates/bugtracker-portlet-components.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/templates/bugtracker-portlet-components.pt	2011-06-02 23:32:14 +0000
@@ -0,0 +1,37 @@
+<div
+    xmlns:tal="http://xml.zope.org/namespaces/tal"
+    xmlns:metal="http://xml.zope.org/namespaces/metal"
+    xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+    class="portlet" id="portlet-components">
+  <h2>Components</h2>
+  <p>
+    You can link components from this bug tracker to their corresponding
+    distribution source packages in the project's &ldquo;Change
+    components&rdquo; page.
+  </p>
+  <ul tal:define="related_component_groups view/related_component_groups">
+    <li tal:repeat="component_group related_component_groups">
+      <strong><span tal:replace="component_group/name" /></strong>
+      <ul tal:define="components component_group/components">
+        <li tal:repeat="component components">
+          <span tal:replace="component/name" />
+          &nbsp;
+          <span tal:condition="component/distro_source_package">
+            <a class="sprite edit"
+               tal:attributes="href string:${context/fmt:url}/+components/${component_group/id}/${component/id}/+edit">
+               <span tal:replace="structure component/distro_source_package/name"/></a>
+          </span>
+          <a class="sprite add"
+             tal:condition="not: component/distro_source_package"
+             tal:attributes="href string:${context/fmt:url}/+components/${component_group/id}/${component/id}/+edit"></a>
+        </li>
+        <li tal:condition="not: components">
+          <i>This bug tracker has no components for this group</i>
+        </li>
+      </ul>
+    </li>
+    <li tal:condition="not: related_component_groups">
+      <i>This bug tracker has no components</i>
+    </li>
+  </ul>
+</div>

=== modified file 'lib/lp/bugs/tests/test_bugtracker_components.py'
--- lib/lp/bugs/tests/test_bugtracker_components.py	2010-10-15 06:01:53 +0000
+++ lib/lp/bugs/tests/test_bugtracker_components.py	2011-06-02 23:32:14 +0000
@@ -88,15 +88,26 @@
 
     def test_link_distro_source_package(self):
         """Check that a link can be set to a distro source package"""
+        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
         component = self.factory.makeBugTrackerComponent(
             u'example', self.comp_group)
         package = self.factory.makeDistributionSourcePackage()
         self.assertIs(None, component.distro_source_package)
 
+        # No components link to the source package yet
+        link_comp = self.bug_tracker.getRemoteComponentForDistroSourcePackageName(
+            ubuntu, component.distro_source_package.name)
+        self.assertIs(None, link_comp)
+
         # Set the source package on the component
         component.distro_source_package = package
         self.assertIsNot(None, component.distro_source_package)
 
+        # Verify we can find the component by the source package now
+        link_comp = self.bug_tracker.getRemoteComponentForDistroSourcePackageName(
+            ubuntu, component.distro_source_package.name)
+        self.assertIsNot(None, link_comp)
+
 
 class TestBugTrackerWithComponents(TestCaseWithFactory):