Merge lp:~sinzui/launchpad/series-branch-target into lp:launchpad

[Curtis Hovey]

See the revised merge summary below

[Tim Penhey (thumper)]

Looks good

review: Approve

[Curtis Hovey (sinzui)]

Hi Tim.

There was a single test failure that showed that this change toppled all the facet/navigation links for product series. Both classes of link reply on IPrimaryContext. This change made all productseries application and involvement links go to the product.

I am reimplementing this by removing the IBranchTarget adapter. My fix is to subclass the the InvolvementMenu and view for IProductSeries. This is not as simple as it seems. Edwin did this recently and discovered that we could not import anything from browser.pillar without causing insane adaptions; he had to place product related classes in the pillar modile. My implementaiton solves this by removing the inline python providesAdapter() and using ZCML--damn it, ZCML is useful :(

Since Edwin's branch is landing, I will wait for his branch to be merged, and I will fix his classes. I will seek a re-review on Monday I think.

review: Needs Fixing

[Curtis Hovey (sinzui)]

This is my branch to remove ProductSeriesBranchTarget.

    lp:~sinzui/launchpad/series-branch-target
    Diff size: 500
    Launchpad bug: https://bugs.launchpad.net/bugs/558307
    Test command: ./bin/test -vv \
        -t test_branchtarget \
        -t pillar-views \
        -t productseries-views
    Pre-implementation: thumper, edwin
    Target release: 10.04

Remove ProductSeriesBranchTarget
--------------------------------

Thumper says that ProductSeriesBranchTarget shouldn't exist. It does not
follow the BranchTarget model and leads to confusion, and wasted effort
trying to understand it.

The suggested change of using a function to return ProductBranchTarget
broke the facet menus (Application/tab menus) because the IPrimaryContext
for IProductSeries was wrongly changed to IProduct.

The correct fix is to remove the branch adaption and fixing the link in an
adaption InvolvedMenu. This requires fixing the adaption insanity that
happens when lp.registry.browser.pillar is imported into another module.

Rules
-----

    * Remove the ProductBranchTarget subclass with a function that returns
      ProductBranchTarget.
    * Subclass the InvolvedMenu to provide the correct link for ProductSeries.
    * Fix the adaption issues caused by importing browser.pillar.
    * Moved the Product and ProductSeries views in pillar to their proper
      modules.

QA
--

    * Visit https://edge.launchpad.net/gdp/trunk
    * Choose Submit code from the Involvement menu
    * Verify that you see the Register a branch on Gedit Developer Plugins
      page (not an oops.)

Lint
----

Linting changed files:
    * lib/lp/code/configure.zcml
    * lib/lp/code/model/branchtarget.py
    * lib/lp/code/model/tests/test_branchtarget.py
    * lib/lp/registry/browser/configure.zcml
    * lib/lp/registry/browser/pillar.py
    * lib/lp/registry/browser/product.py
    * lib/lp/registry/browser/productseries.py
    * lib/lp/registry/browser/tests/pillar-views.txt
    * lib/lp/registry/browser/tests/productseries-views.txt

Test
----

    * lib/lp/code/model/tests/test_branchtarget.py
      * Removed test for removed code.
    * lib/lp/registry/browser/tests/pillar-views.txt
      * Removed product series test because there is a better test.
    * lib/lp/registry/browser/tests/productseries-views.txt
      * Added a test to verify all the productseries links are to the
        correct host and target.

Implementation
--------------

    * lib/lp/code/configure.zcml
      * Unregistered removed code.
    * lib/lp/code/model/branchtarget.py
      * Removed the adapter.
    * lib/lp/registry/browser/configure.zcml
      * Moved the InvolvedMenu provideAdapter registration into the zcml to
        insanity when pillar is imported.
      * Moved the Product and ProductSeries registrations to their proper
        location in the ZCML file.
      * Registered a new adapter for ProductSeriesInvolvedMenu.
    * lib/lp/registry/browser/pillar.py
      * Removed the provideAdapter call that causes alternate registrations
        when browser.pillar is imported. Used ZCML to do the registration.
      * Moved the Product and ProductSeries views to their proper modules.
    * lib/...

[Aaron Bentley (abentley)]

review: Approve

[Curtis Hovey (sinzui)]

review: Abstain

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2010-02-22 01:13:15 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2010-04-13 04:18:28 +0000
@@ -291,12 +291,6 @@
         add_view = self.get_view(product)
         self.assertTrue(IBranchTarget.providedBy(add_view.target))
 
-    def test_target_productseries(self):
-        product = self.factory.makeProduct()
-        series = self.factory.makeProductSeries(product=product)
-        add_view = self.get_view(series)
-        self.assertTrue(IBranchTarget.providedBy(add_view.target))
-
 
 class TestBranchReviewerEditView(TestCaseWithFactory):
     """Test the BranchReviewerEditView view."""

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-04-09 02:08:39 +0000
+++ lib/lp/code/configure.zcml	2010-04-13 04:18:28 +0000
@@ -674,10 +674,6 @@
       provides="lp.code.interfaces.branchtarget.IBranchTarget"
       factory="lp.code.model.branchtarget.ProductBranchTarget"/>
   <adapter
-      for="lp.registry.interfaces.product.IProductSeries"
-      provides="lp.code.interfaces.branchtarget.IBranchTarget"
-      factory="lp.code.model.branchtarget.ProductSeriesBranchTarget"/>
-  <adapter
       for="lp.code.interfaces.branchtarget.IBranchTarget"
       provides="canonical.launchpad.webapp.interfaces.ICanonicalUrlData"
       factory="lp.code.model.branchtarget.get_canonical_url_data_for_target"/>

=== modified file 'lib/lp/code/model/branchtarget.py'
--- lib/lp/code/model/branchtarget.py	2010-04-09 02:08:39 +0000
+++ lib/lp/code/model/branchtarget.py	2010-04-13 04:18:28 +0000
@@ -9,7 +9,6 @@
     'PackageBranchTarget',
     'PersonBranchTarget',
     'ProductBranchTarget',
-    'ProductSeriesBranchTarget',
     ]
 
 from zope.component import getUtility
@@ -337,23 +336,6 @@
         branch.sourcepackagename = None
 
 
-class ProductSeriesBranchTarget(ProductBranchTarget):
-
-    def __init__(self, productseries):
-        self.productseries = productseries
-        self.product = productseries.product
-
-    @property
-    def context(self):
-        """See `IBranchTarget`."""
-        return self.productseries
-
-    @property
-    def supports_code_imports(self):
-        """See `IBranchTarget`."""
-        return False
-
-
 def get_canonical_url_data_for_target(branch_target):
     """Return the `ICanonicalUrlData` for an `IBranchTarget`."""
     return ICanonicalUrlData(branch_target.context)

=== modified file 'lib/lp/code/model/tests/test_branchtarget.py'
--- lib/lp/code/model/tests/test_branchtarget.py	2010-04-09 02:08:39 +0000
+++ lib/lp/code/model/tests/test_branchtarget.py	2010-04-13 04:18:28 +0000
@@ -12,8 +12,7 @@
 
 from lp.code.model.branchtarget import (
     check_default_stacked_on,
-    PackageBranchTarget, PersonBranchTarget, ProductBranchTarget,
-    ProductSeriesBranchTarget)
+    PackageBranchTarget, PersonBranchTarget, ProductBranchTarget)
 from lp.code.enums import BranchType, RevisionControlSystems
 from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.code.interfaces.codeimport import ICodeImport
@@ -415,30 +414,6 @@
         self.assertEqual(self.target, code_import.branch.target)
 
 
-class TestProductSeriesBranchTarget(TestCaseWithFactory):
-
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        TestCaseWithFactory.setUp(self)
-        self.original = self.factory.makeProductSeries()
-        self.target = ProductSeriesBranchTarget(self.original)
-
-    def test_adapter(self):
-        target = IBranchTarget(self.original)
-        self.assertIsInstance(target, ProductSeriesBranchTarget)
-
-    def test_doesnt_support_code_imports(self):
-        self.assertFalse(self.target.supports_code_imports)
-
-    def test_creating_code_import_fails(self):
-        self.assertRaises(
-            AssertionError, self.target.newCodeImport,
-                self.factory.makePerson(),
-                self.factory.getUniqueString("name-"),
-                RevisionControlSystems.GIT, url=self.factory.getUniqueURL())
-
-
 class TestCheckDefaultStackedOnBranch(TestCaseWithFactory):
     """Only certain branches are allowed to be default stacked-on branches."""
 

=== modified file 'lib/lp/code/stories/branches/xx-creating-branches.txt'
--- lib/lp/code/stories/branches/xx-creating-branches.txt	2009-11-13 21:28:28 +0000
+++ lib/lp/code/stories/branches/xx-creating-branches.txt	2010-04-13 04:18:28 +0000
@@ -175,7 +175,7 @@
     >>> browser.open('http://launchpad.dev/gnome-terminal/trunk')
     >>> browser.getLink('registering a mirrored branch').click()
     >>> print browser.title
-    Register a branch : Series trunk : GNOME Terminal
+    Register a branch : GNOME Terminal
 
 The user sees that he is registering a branch for the series' project.
 

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-04-08 19:19:13 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-04-13 04:18:28 +0000
@@ -483,6 +483,12 @@
         for="lp.registry.interfaces.pillar.IPillarNameSet"
         path_expression="string:pillars"
         parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
+    <adapter
+        provides="canonical.launchpad.webapp.interfaces.INavigationMenu"
+        for="lp.registry.browser.pillar.IInvolved"
+        factory="lp.registry.browser.pillar.InvolvedMenu"
+        name="overview"
+        permission="zope.Public"/>
     <browser:page
         for="lp.registry.interfaces.pillar.IPillar"
         name="+listing-simple"
@@ -495,20 +501,6 @@
         facet="overview"
         permission="zope.Public"
         template="../templates/pillar-involvement-portlet.pt"/>
-    <browser:page
-        name="+get-involved"
-        for="lp.registry.interfaces.product.IProduct"
-        class="lp.registry.browser.pillar.ProductInvolvementView"
-        facet="overview"
-        permission="zope.Public"
-        template="../templates/pillar-involvement-portlet.pt"/>
-    <browser:page
-        name="+get-involved"
-        for="lp.registry.interfaces.product.IProductSeries"
-        class="lp.registry.browser.pillar.ProductSeriesInvolvementView"
-        facet="overview"
-        permission="zope.Public"
-        template="../templates/pillar-involvement-portlet.pt"/>
     <facet
         facet="overview">
         <browser:url
@@ -1384,6 +1376,13 @@
         path_expression="name"
         parent_utility="canonical.launchpad.interfaces.ILaunchpadRoot"/>
     <browser:page
+        name="+get-involved"
+        for="lp.registry.interfaces.product.IProduct"
+        class="lp.registry.browser.product.ProductInvolvementView"
+        facet="overview"
+        permission="zope.Public"
+        template="../templates/pillar-involvement-portlet.pt"/>
+    <browser:page
         for="lp.registry.interfaces.product.IProduct"
         name="+download"
         class="lp.registry.browser.product.ProductDownloadFilesView"
@@ -1600,6 +1599,12 @@
         for="lp.registry.interfaces.productseries.IProductSeries"
         path_expression="name"
         attribute_to_parent="product"/>
+    <adapter
+        provides="canonical.launchpad.webapp.interfaces.INavigationMenu"
+        for="lp.registry.browser.productseries.IProductSeriesInvolved"
+        factory="lp.registry.browser.productseries.ProductSeriesInvolvedMenu"
+        name="overview"
+        permission="zope.Public"/>
     <browser:defaultView
         for="lp.registry.interfaces.productseries.IProductSeries"
         name="+index"/>
@@ -1611,6 +1616,13 @@
         for="lp.registry.interfaces.productseries.IProductSeries"
         layer="canonical.launchpad.layers.BugsLayer"
         name="+bugs-index"/>
+    <browser:page
+        name="+get-involved"
+        for="lp.registry.interfaces.productseries.IProductSeries"
+        class="lp.registry.browser.productseries.ProductSeriesInvolvementView"
+        facet="overview"
+        permission="zope.Public"
+        template="../templates/pillar-involvement-portlet.pt"/>
     <browser:pages
         for="lp.registry.interfaces.productseries.IProductSeries"
         facet="overview"

=== modified file 'lib/lp/registry/browser/pillar.py'
--- lib/lp/registry/browser/pillar.py	2010-04-09 18:19:54 +0000
+++ lib/lp/registry/browser/pillar.py	2010-04-13 04:18:28 +0000
@@ -6,17 +6,16 @@
 __metaclass__ = type
 
 __all__ = [
+    'InvolvedMenu',
     'PillarView',
     ]
 
 
 from operator import attrgetter
 
-from zope.component.globalregistry import provideAdapter
 from zope.interface import implements, Interface
 
 from canonical.cachedproperty import cachedproperty
-from canonical.launchpad.webapp.interfaces import INavigationMenu
 from canonical.launchpad.webapp.menu import Link, NavigationMenu
 from canonical.launchpad.webapp.publisher import LaunchpadView, nearest
 from canonical.launchpad.webapp.tales import MenuAPI
@@ -146,56 +145,3 @@
         return sorted([
             link for link in important_links if not link.enabled],
             key=attrgetter('sort_key'))
-
-
-provideAdapter(
-    InvolvedMenu, [IInvolved], INavigationMenu, name="overview")
-
-
-# This class can't be moved into the browser/product.py file, since
-# the pillar-views.txt test will fail due to the MenuAPI adapter
-# for PillarView.enabled_links not working.
-class ProductInvolvementView(PillarView):
-    """Encourage configuration of involvement links for projects."""
-
-    has_involvement = True
-    visible_disabled_link_names = ['submit_code']
-
-    @property
-    def configuration_links(self):
-        """The enabled involvement links."""
-        overview_menu = MenuAPI(self.context).overview
-        series_menu = MenuAPI(self.context.development_focus).overview
-        configuration_names = [
-            'configure_answers',
-            'configure_bugtracker',
-            'configure_translations',
-            ]
-        configuration_links = [
-            overview_menu[name] for name in configuration_names]
-        set_branch = series_menu['set_branch']
-        set_branch.text = 'Configure project branch'
-        configuration_links.append(set_branch)
-        return sorted([
-            link for link in configuration_links if link.enabled],
-            key=attrgetter('sort_key'))
-
-
-class ProductSeriesInvolvementView(PillarView):
-    """Encourage configuration of involvement links for project series."""
-
-    has_involvement = True
-    visible_disabled_link_names = ['submit_code']
-
-    def __init__(self, context, request):
-        super(ProductSeriesInvolvementView, self).__init__(context, request)
-        self.official_codehosting = self.context.branch is not None
-        self.official_answers = False
-
-    @property
-    def configuration_links(self):
-        """The enabled involvement links."""
-        series_menu = MenuAPI(self.context).overview
-        set_branch = series_menu['set_branch']
-        set_branch.text = 'Configure series branch'
-        return [set_branch]

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-04-08 19:19:13 +0000
+++ lib/lp/registry/browser/product.py	2010-04-13 04:18:28 +0000
@@ -14,7 +14,6 @@
     'ProductBugsMenu',
     'ProductConfigureAnswersView',
     'ProductConfigureBlueprintsView',
-    'ProductConfigureBranchesView',
     'ProductConfigureBugTrackerView',
     'ProductConfigureTranslationsView',
     'ProductDownloadFileMixin',
@@ -94,6 +93,7 @@
     IRegistryCollectionNavigationMenu, RegistryCollectionActionMenuBase)
 from lp.answers.browser.faqtarget import FAQTargetNavigationMixin
 from canonical.launchpad.browser.feeds import FeedsMixin
+from lp.registry.browser.pillar import PillarView
 from lp.registry.browser.productseries import get_series_branch_error
 from lp.translations.browser.customlanguagecode import (
     HasCustomLanguageCodesTraversalMixin)
@@ -115,6 +115,7 @@
     action, custom_widget, LaunchpadEditFormView, LaunchpadFormView,
     ReturnToReferrerMixin)
 from canonical.launchpad.webapp.menu import NavigationMenu
+from canonical.launchpad.webapp.tales import MenuAPI
 from canonical.widgets.popup import PersonPickerWidget
 from canonical.widgets.date import DateWidget
 from canonical.widgets.itemswidgets import (
@@ -299,6 +300,32 @@
         return Link('', text, summary)
 
 
+class ProductInvolvementView(PillarView):
+    """Encourage configuration of involvement links for projects."""
+
+    has_involvement = True
+    visible_disabled_link_names = ['submit_code']
+
+    @property
+    def configuration_links(self):
+        """The enabled involvement links."""
+        overview_menu = MenuAPI(self.context).overview
+        series_menu = MenuAPI(self.context.development_focus).overview
+        configuration_names = [
+            'configure_answers',
+            'configure_bugtracker',
+            'configure_translations',
+            ]
+        configuration_links = [
+            overview_menu[name] for name in configuration_names]
+        set_branch = series_menu['set_branch']
+        set_branch.text = 'Configure project branch'
+        configuration_links.append(set_branch)
+        return sorted([
+            link for link in configuration_links if link.enabled],
+            key=attrgetter('sort_key'))
+
+
 class ProductNavigationMenu(NavigationMenu):
 
     usedfor = IProduct
@@ -420,6 +447,7 @@
         'announcements',
         'administer',
         'review_license',
+        'branch_add',
         'branchvisibility',
         'rdf',
         'branding',
@@ -476,6 +504,11 @@
         text = 'Branch Visibility Policy'
         return Link('+branchvisibility', text, icon='edit')
 
+    def branch_add(self):
+        text = 'Register a branch'
+        summary = "Register a new Bazaar branch for this project"
+        return Link('+addbranch', text, summary, icon='add')
+
 
 class ProductBugsMenu(ApplicationMenu, StructuralSubscriptionMenuMixin):
 

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2010-04-09 02:25:21 +0000
+++ lib/lp/registry/browser/productseries.py	2010-04-13 04:18:28 +0000
@@ -13,6 +13,7 @@
     'ProductSeriesEditView',
     'ProductSeriesFacets',
     'ProductSeriesFileBugRedirect',
+    'ProductSeriesInvolvementView',
     'ProductSeriesLinkBranchView',
     'ProductSeriesLinkBranchFromCodeView',
     'ProductSeriesNavigation',
@@ -34,7 +35,7 @@
 from zope.component import getUtility
 from zope.app.form.browser import TextAreaWidget, TextWidget
 from zope.formlib import form
-from zope.interface import Interface
+from zope.interface import implements, Interface
 from zope.schema import Choice
 from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
 
@@ -84,11 +85,13 @@
     action, custom_widget, LaunchpadEditFormView, LaunchpadFormView,
     ReturnToReferrerMixin)
 from canonical.launchpad.webapp.menu import structured
+from canonical.launchpad.webapp.tales import MenuAPI
 from canonical.widgets.itemswidgets import LaunchpadRadioWidget
 from canonical.widgets.textwidgets import StrippedTextWidget
 
 from lp.registry.browser import (
     MilestoneOverlayMixin, RegistryDeleteViewMixin)
+from lp.registry.browser.pillar import InvolvedMenu, PillarView
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.productseries import IProductSeries
 
@@ -168,13 +171,53 @@
         return Link(link, text, summary=summary)
 
 
+class IProductSeriesInvolved(Interface):
+    """A marker interface for getting involved."""
+
+
+class ProductSeriesInvolvedMenu(InvolvedMenu):
+    """The get involved menu."""
+    usedfor = IProductSeriesInvolved
+    links = [
+        'report_bug', 'help_translate', 'submit_code', 'register_blueprint']
+
+    def submit_code(self):
+        product = self.context.context.product
+        target = canonical_url(
+            product, view_name='+addbranch', rootsite='code')
+        enabled = product.official_codehosting
+        return Link(
+            target, 'Submit code', icon='code', enabled=enabled)
+
+
+class ProductSeriesInvolvementView(PillarView):
+    """Encourage configuration of involvement links for project series."""
+
+    implements(IProductSeriesInvolved)
+    has_involvement = True
+    visible_disabled_link_names = ['submit_code']
+
+    def __init__(self, context, request):
+        super(ProductSeriesInvolvementView, self).__init__(context, request)
+        self.official_codehosting = self.context.branch is not None
+        self.official_answers = False
+
+    @property
+    def configuration_links(self):
+        """The enabled involvement links."""
+        series_menu = MenuAPI(self.context).overview
+        set_branch = series_menu['set_branch']
+        set_branch.text = 'Configure series branch'
+        return [set_branch]
+
+
 class ProductSeriesOverviewMenu(
     ApplicationMenu, StructuralSubscriptionMenuMixin):
     """The overview menu."""
     usedfor = IProductSeries
     facet = 'overview'
     links = [
-        'edit', 'delete', 'driver', 'link_branch', 'branch_add', 'ubuntupkg',
+        'edit', 'delete', 'driver', 'link_branch', 'ubuntupkg',
         'create_milestone', 'create_release', 'rdf', 'subscribe',
         'set_branch',
         ]
@@ -228,11 +271,6 @@
             summary = 'Change the branch for this series'
         return Link('+setbranch', text, summary, icon=icon)
 
-    def branch_add(self):
-        text = 'Register a branch'
-        summary = "Register a new Bazaar branch for this series' project"
-        return Link('+addbranch', text, summary, icon='add')
-
     @enabled_with_permission('launchpad.AnyPerson')
     def ubuntupkg(self):
         """Return a link to link this series to an ubuntu sourcepackage."""
@@ -507,7 +545,6 @@
             # to this series, or any other series.
             pass
 
-
     @action('Update', name='continue')
     def continue_action(self, action, data):
         # set the packaging record for this productseries in the current
@@ -879,8 +916,8 @@
         # Extend the allowed schemes for the repository URL based on
         # rcs_type.
         extra_schemes = {
-            RevisionControlSystemsExtended.BZR_SVN:['svn'],
-            RevisionControlSystemsExtended.GIT:['git'],
+            RevisionControlSystemsExtended.BZR_SVN: ['svn'],
+            RevisionControlSystemsExtended.GIT: ['git'],
             }
         schemes.update(extra_schemes.get(rcs_type, []))
         return schemes
@@ -933,7 +970,7 @@
     @property
     def target(self):
         """The branch target for the context."""
-        return IBranchTarget(self.context)
+        return IBranchTarget(self.context.product)
 
     @action(_('Update'), name='update')
     def update_action(self, action, data):

=== modified file 'lib/lp/registry/browser/tests/pillar-views.txt'
--- lib/lp/registry/browser/tests/pillar-views.txt	2010-04-09 02:25:21 +0000
+++ lib/lp/registry/browser/tests/pillar-views.txt	2010-04-13 04:18:28 +0000
@@ -132,16 +132,6 @@
     ...     print link.name
     report_bug
 
-ProductSeries can use this view. The product is used to set the links,
-but the answers link will be disbaled.
-
-    >>> series = factory.makeProductSeries(product=product)
-    >>> product.official_answers = True
-    >>> view = create_view(series, '+get-involved')
-    >>> for link in view.enabled_links:
-    ...     print link.name
-    register_blueprint
-
 DistributionSourcePackages can use this view. The distribution is used to
 set the links.  Despite the fact that the distribution uses blueprints,
 and translations those links are not enabled for DistributionSourcePackages.

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2010-04-02 14:08:22 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2010-04-13 04:18:28 +0000
@@ -1,7 +1,7 @@
 ProductSeries Views
 ===================
 
-Productseries menus
+ProductSeries menus
 -------------------
 
 The ProductSeriesOverviewMenu provides the links to the common ProductSeries
@@ -11,11 +11,37 @@
     ...     ProductSeriesOverviewMenu)
     >>> from lp.testing.menu import check_menu_links
 
-    >>> series = factory.makeSeries()
+    >>> product = factory.makeProduct(name='app')
+    >>> series = factory.makeSeries(name='simple', product=product)
     >>> check_menu_links(ProductSeriesOverviewMenu(series))
     True
 
 
+ProductSeries Involvement links
+...............................
+
+The ProductSeries involvement view uses the ProductSeriesInvolvedMenu when
+rendering links:
+
+    >>> from operator import attrgetter
+    >>> from canonical.launchpad.webapp.tales import MenuAPI
+
+    >>> login_person(product.owner)
+    >>> product.official_answers = True
+    >>> product.official_blueprints = True
+    >>> product.official_malone = True
+    >>> product.official_rosetta = True
+    >>> view = create_view(series, '+get-involved')
+    >>> menuapi = MenuAPI(view)
+    >>> for link in sorted(
+    ...     menuapi.navigation.values(), key=attrgetter('sort_key')):
+    ...     print link.url
+    http://bugs.launchpad.dev/app/simple/+filebug
+    http://translations.launchpad.dev/app/simple
+    http://code.launchpad.dev/app/+addbranch
+    http://blueprints.launchpad.dev/app/simple/+addspec
+
+
 ProductSeries view
 ------------------
 
@@ -26,9 +52,6 @@
     >>> from canonical.launchpad.testing.pages import find_tag_by_id
 
     >>> login('[e-mail]')
-
-    >>> product = factory.makeProduct(name='app')
-    >>> series = factory.makeSeries(name='simple', product=product)
     >>> view = create_view(series, '+index', principal=product.owner)
     >>> script = find_tag_by_id(view.render(), 'milestone-script')
     >>> print script

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2010-04-10 09:24:41 +0000
+++ lib/lp/registry/model/distribution.py	2010-04-13 04:18:28 +0000
@@ -21,6 +21,7 @@
 from lp.archivepublisher.debversion import Version
 from canonical.cachedproperty import cachedproperty
 from canonical.database.constants import UTC_NOW
+
 from canonical.database.datetimecol import UtcDateTimeCol
 from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import (

=== modified file 'lib/lp/registry/templates/productseries-codesummary.pt'
--- lib/lp/registry/templates/productseries-codesummary.pt	2010-03-11 15:32:22 +0000
+++ lib/lp/registry/templates/productseries-codesummary.pt	2010-04-13 04:18:28 +0000
@@ -35,7 +35,7 @@
           <ul class="bulleted" style="margin-bottom: 0;">
             <li>
               Have the branch mirrored from a remote location by
-               <a tal:attributes="href context/menu:overview/branch_add/fmt:url">
+               <a tal:attributes="href context/product/menu:overview/branch_add/fmt:url">
               registering a mirrored branch</a>
             </li>
             <li id="ssh-key-directions">

=== modified file 'lib/lp/registry/templates/productseries-linkbranch.pt'
--- lib/lp/registry/templates/productseries-linkbranch.pt	2010-03-11 15:26:46 +0000
+++ lib/lp/registry/templates/productseries-linkbranch.pt	2010-04-13 04:18:28 +0000
@@ -22,7 +22,7 @@
           <ul class="bulleted" style="margin-bottom: 0;">
             <li>
               Have the branch mirrored from a remote location by
-               <a tal:attributes="href context/menu:overview/branch_add/fmt:url">
+               <a tal:attributes="href context/product/menu:overview/branch_add/fmt:url">
               registering a mirrored branch</a>
             </li>
             <li id="ssh-key-directions">