Merge lp:~edwin-grubbs/launchpad/bug-525956-unlink-button into lp:launchpad

[Edwin Grubbs]

Added ability to unlink sourcepackages and project series from the sourcepackage index page.

[Edwin Grubbs (edwin-grubbs)]

Summary
-------

The sourcepackage index page had an edit button but no way to remove
a link to the upstream via the project series.

The $distroseries/+packaging page also displayed identical info,
so I moved that into a template that could be shared.

Implementation details
----------------------

Moved identical formatting of upstream connection info from
distroseries-packaging.pt and sourcepackage-portlet-associations.pt
into sourcepackage-upstream-connections.pt. Added the (-) removal link
and moved the edit link next to the projectgroup/project/series info.
    lib/lp/registry/browser/configure.zcml
    lib/lp/registry/templates/distroseries-packaging.pt
    lib/lp/registry/templates/sourcepackage-portlet-associations.pt
    lib/lp/registry/templates/sourcepackage-upstream-connections.pt

Added $sourcepackage/+remove-packaging and $sourcepackage/upstream-connections.
    lib/lp/registry/browser/sourcepackage.py
    lib/lp/registry/browser/tests/sourcepackage-views.txt
    lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt
    lib/lp/registry/templates/sourcepackage-remove-packaging.pt

Drive-by improvement of formatting.
    lib/lp/registry/model/productseries.py
    lib/lp/registry/model/sourcepackage.py

Tests
-----

./bin/test -vv -t 'sourcepackage-views.txt|xx-show-distroseries-packaging.txt'

Demo and Q/A
------------

* Open https://launchpad.dev/ubuntu/hoary/+source/evolution
    * If there is a "Link to Upstream Project" button, use that
      since the removal button won't show up without an existing link.
    * The Upstream Connections portlet should show:
        GNOME ⇒ Evolution ⇒ trunk (E) (-)
      where (E) is the edit button, and (-) is the remove button.
    * Click on the (-) button.
    * Click on the Unlink button.
    * The Upstream Connections portlet should now show the
      "Link to Upstream Project" button again.
* Open https://launchpad.dev/ubuntu/hoary/+packaging
    * The table should now show the projectgroup/project/series like so:
        GNOME ⇒ Evolution ⇒ trunk (E) (-)

[Eleanor Berger (intellectronica)]

review: Approve (code ui*)

[Curtis Hovey (sinzui)]

Hi Edwin.

This this was a nice feature to use on the sp page. I think we should consider using it on the dsp page: https://launchpad.dev/ubuntu/+source/evolution. We have a post back that some people have expressed concern about how easy it is to make a mistake. I would not say this is change we must do because the post back always returns the user to the dsp page--using the sp as the next_url would be confusing.

I think we should remove the edit/remove links from the +packaging listing. There is not enough information on this page to make that decision.

review: Needs Information (ui)

[Edwin Grubbs (edwin-grubbs)]

> Hi Edwin.
>
> This this was a nice feature to use on the sp page. I think we should consider
> using it on the dsp page: https://launchpad.dev/ubuntu/+source/evolution. We
> have a post back that some people have expressed concern about how easy it is
> to make a mistake. I would not say this is change we must do because the post
> back always returns the user to the dsp page--using the sp as the next_url
> would be confusing.
>
> I think we should remove the edit/remove links from the +packaging listing.
> There is not enough information on this page to make that decision.

This was supposed to be a simple change for the UI review. It has grown
quite large, so I can create a new merge proposal if you would like.

I started off trying to use +remove-packaging page for the
$distrosourcepackage/+packages page, but I saw that the replaced code
was also used by $product/+packages page, so I changed that page also.

After I got the +remove-packaging page to return to the previous page, I
discovered that the edit link on the $distrosourcepackage/+packages was
returning you to a different page.

All these changes broke a ton of tests.

Pages to check
--------------

The edit and remove buttons for each series are hidden now.
https://launchpad.dev/ubuntu/hoary/+packaging

The remove button now takes you to the $sourcepackage/+remove-packaging page,
and the edit button no
https://launchpad.dev/ubuntu/+source/evolution

The remove button now takes you to the $sourcepackage/+remove-packaging page.
https://launchpad.dev/evolution/+packages

This page shouldn't have changed, but if you want to check that the
show_edit_buttons annotation is passed correctly, you'll need to look at it.
https://launchpad.dev/ubuntu/hoary/+source/evolution

Implementation details
----------------------

Removed trailing white-space.
    lib/canonical/launchpad/icing/style-3-0.css.in

Added Mixin to enable forms to return to their referring page.
    lib/canonical/launchpad/templates/launchpad-form.pt
    lib/canonical/launchpad/webapp/launchpadform.py

Use the ReturnToReferrerMixin that provides the cancel_url and next_url.
Hide the edit/remove buttons by default, but show them in the
annotations portlet, because its view sets
request.annotations['show_edit_buttons'].
sourcepackage-upstream-connections.pt now has it's own view, since
it can't share the view with annotations portlet or show_edit_buttons
would always be true.
    lib/lp/registry/templates/sourcepackage-upstream-connections.pt
    lib/lp/registry/browser/sourcepackage.py
    lib/lp/registry/browser/tests/packaging-views.txt
    lib/lp/registry/browser/configure.zcml

Removed PackagingDeleteView and related code.
    lib/lp/registry/browser/distributionsourcepackage.py
    lib/lp/registry/browser/packaging.py
    lib/lp/registry/browser/product.py
    lib/lp/registry/templates/distributionsourcepackage-index.pt
    lib/lp/registry/templates/product-packages.pt

Added error message for when a user loads this page after the
upstream link has been deleted by someone else.
    lib/lp/registry/templates/sourcepackage-remove-packaging.pt

Tests:
    lib/lp/registry/browser/tests/sourcepackage-views.txt
    lib/lp/...

[Curtis Hovey (sinzui)]

Hi Edwin.

in retrospect, saying no to updating the DSP page would have been better. On the other hand, I and Adi have wanted a mixin as you have created for sometime. I think the pain was worth it, though it was untimely.

I have one question from the diff. What is "irumpy hotter" in lp/registry/browser/tests/packaging-views.txt? This looks like a paste error. I am not aware of a irumpty test distroseries in the test

review: Approve (code + ui)

[Edwin Grubbs (edwin-grubbs)]

> I have one question from the diff. What is "irumpy hotter" in
> lp/registry/browser/tests/packaging-views.txt? This looks like a paste error.
> I am not aware of a irumpty test distroseries in the test

Doh. "irumpy" is so nonsensical and undesirable that irumpy.com is available. Fixed.

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in	2010-02-17 00:43:19 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in	2010-03-06 06:27:33 +0000
@@ -814,7 +814,7 @@
 }
 input[type="submit"].icon-only {
     vertical-align: middle;
-    border: 0; 
+    border: 0;
     padding: 0;
     height: 16px;
     width: 16px;
 
=== modified file 'lib/canonical/launchpad/templates/launchpad-form.pt'
--- lib/canonical/launchpad/templates/launchpad-form.pt	2009-11-26 09:18:22 +0000
+++ lib/canonical/launchpad/templates/launchpad-form.pt	2010-03-06 06:27:33 +0000
@@ -16,6 +16,13 @@
           accept-charset="UTF-8">
 
       <div metal:define-macro="formbody">
+        <tal:comment condition="nothing">
+          This field is used by the ReturnToReferrerMixin.
+        </tal:comment>
+        <input type="hidden"
+               name="_return_url"
+               tal:condition="view/_return_url | nothing"
+               tal:attributes="value view/_return_url" />
 
         <p metal:define-slot="extra_info" tal:replace="nothing">
           This is the description of the form.
 
=== modified file 'lib/canonical/launchpad/webapp/launchpadform.py'
--- lib/canonical/launchpad/webapp/launchpadform.py	2010-02-19 01:50:36 +0000
+++ lib/canonical/launchpad/webapp/launchpadform.py	2010-03-06 06:27:33 +0000
@@ -7,10 +7,11 @@
 __metaclass__ = type
 
 __all__ = [
-    'LaunchpadFormView',
-    'LaunchpadEditFormView',
     'action',
     'custom_widget',
+    'LaunchpadEditFormView',
+    'LaunchpadFormView',
+    'ReturnToReferrerMixin',
     'safe_action',
     ]
 
@@ -32,7 +33,7 @@
     IMultiLineWidgetLayout, ICheckBoxWidgetLayout,
     IAlwaysSubmittedWidget, UnsafeFormGetSubmissionError)
 from canonical.launchpad.webapp.menu import escape
-from canonical.launchpad.webapp.publisher import LaunchpadView
+from canonical.launchpad.webapp.publisher import canonical_url, LaunchpadView
 
 
 classImplements(CheckBoxWidget, ICheckBoxWidgetLayout)
@@ -434,3 +435,30 @@
     """
     action.is_safe = True
     return action
+
+
+class ReturnToReferrerMixin:
+    """Return to the previous page after submitting the form.
+
+    The _return_url is stored in a hidden field in the launchpad-form.pt
+    between the request to view the form and submitting the form.
+    """
+
+    @property
+    def _return_url(self):
+        """See `LaunchpadFormView`."""
+        # The referer header we want is only available before the view's
+        # form submits to itself. This field is a hidden input in the form.
+        referrer = self.request.form.get('_return_url')
+        if referrer is None:
+            # "referer" is misspelled in the HTTP specification.
+            referrer = self.request.getHeader('referer')
+
+        if (referrer is not None
+            and referrer.startswith(self.request.getApplicationURL())):
+            return referrer
+        else:
+            return canonical_url(self.context)
+
+    next_url = _return_url
+    cancel_url = _return_url
 
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-03-05 14:18:18 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-03-06 06:27:33 +0000
@@ -1946,6 +1946,14 @@
         facet="overview"
         class="lp.registry.browser.sourcepackage.SourcePackageAssociationPortletView"
         template="../templates/sourcepackage-portlet-associations.pt"/>
+
+    <browser:page
+        for="lp.registry.interfaces.sourcepackage.ISourcePackage"
+        permission="zope.Public"
+        name="+upstream-connections"
+        facet="overview"
+        class="lp.registry.browser.sourcepackage.SourcePackageUpstreamConnectionsView"
+        template="../templates/sourcepackage-upstream-connections.pt"/>
     <browser:page
         for="lp.registry.interfaces.sourcepackage.ISourcePackage"
         permission="zope.Public"
@@ -2122,6 +2130,14 @@
         facet="overview"
         template="../templates/sourcepackage-edit-packaging.pt"
         />
+    <browser:page
+        for="lp.registry.interfaces.sourcepackage.ISourcePackage"
+        permission="launchpad.AnyPerson"
+        class="lp.registry.browser.sourcepackage.SourcePackageRemoveUpstreamView"
+        name="+remove-packaging"
+        facet="overview"
+        template="../templates/sourcepackage-remove-packaging.pt"
+        />
 
     <browser:page
         for="lp.registry.interfaces.structuralsubscription.IStructuralSubscriptionTarget"
 
=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
--- lib/lp/registry/browser/distributionsourcepackage.py	2010-01-06 12:02:38 +0000
+++ lib/lp/registry/browser/distributionsourcepackage.py	2010-03-06 06:27:33 +0000
@@ -49,7 +49,6 @@
 from lp.soyuz.interfaces.distributionsourcepackagerelease import (
     IDistributionSourcePackageRelease)
 from lp.soyuz.interfaces.packagediff import IPackageDiffSet
-from lp.registry.browser.packaging import PackagingDeleteView
 from lp.registry.interfaces.pocket import pocketsuffix
 from lp.translations.browser.customlanguagecode import (
     HasCustomLanguageCodesTraversalMixin)
@@ -243,7 +242,7 @@
 
 
 class DistributionSourcePackageView(DistributionSourcePackageBaseView,
-                                    PackagingDeleteView):
+                                    LaunchpadView):
     """View class for DistributionSourcePackage."""
     implements(IDistributionSourcePackageActionMenu)
 
@@ -257,14 +256,6 @@
         return canonical_url(self.context)
 
     @property
-    def all_packaging(self):
-        """See `PackagingDeleteView`."""
-        for sourcepackage in self.context.get_distroseries_packages():
-            packaging = sourcepackage.direct_packaging
-            if packaging is not None:
-                yield packaging
-
-    @property
     def all_published_in_active_distroseries(self):
         """Return a list of publishings in each active distroseries.
 
@@ -408,16 +399,6 @@
         for distroseries in self.active_series:
             # The first row for each series is the "title" row.
             packaging = packages_by_series[distroseries].direct_packaging
-            if packaging is None:
-                delete_packaging_form_id = None
-                hidden_packaging_field = None
-            else:
-                delete_packaging_form_id = "delete_%s_%s_%s" % (
-                    packaging.distroseries.name,
-                    packaging.productseries.product.name,
-                    packaging.productseries.name)
-                hidden_packaging_field = self._renderHiddenPackagingField(
-                    packaging)
             package = packages_by_series[distroseries]
             title_row = {
                 'blank_row': False,
@@ -426,8 +407,6 @@
                 'distroseries': distroseries,
                 'series_package': package,
                 'packaging': packaging,
-                'hidden_packaging_field': hidden_packaging_field,
-                'delete_packaging_form_id': delete_packaging_form_id,
                 }
             rows.append(title_row)
 
 
=== removed file 'lib/lp/registry/browser/packaging.py'
--- lib/lp/registry/browser/packaging.py	2010-01-21 23:46:24 +0000
+++ lib/lp/registry/browser/packaging.py	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-__metaclass__ = type
-
-__all__ = [
-    'PackagingDeleteView',
-    ]
-
-from zope.component import getUtility
-from zope.formlib import form
-from zope.schema import Choice
-from zope.schema.vocabulary import SimpleTerm, SimpleVocabulary
-
-from canonical.launchpad import _
-from lp.registry.interfaces.packaging import IPackagingUtil
-from canonical.launchpad.webapp.launchpadform import action, LaunchpadFormView
-
-
-class PackagingDeleteView(LaunchpadFormView):
-    """A base view that provides packaging link deletion."""
-
-    @property
-    def all_packaging(self):
-        """An iterator of the context's packaging links."""
-        raise NotImplementedError
-
-    def setUpFields(self):
-        """See `LaunchpadFormView`."""
-        # No schema is set in this form, because all fields are created with
-        # custom vocabularies. So we must not call the inherited setUpField
-        # method.
-        self.form_fields = self._createPackagingField()
-
-    @property
-    def can_delete_packaging(self):
-        """Whether the user can delete existing packaging links."""
-        return self.user is not None
-
-    def _createPackagingField(self):
-        """Create a field to specify a Packaging association.
-
-        Create a contextual vocabulary that can specify one of the Packaging
-        associated to this DistributionSourcePackage.
-        """
-        terms = []
-        for packaging in self.all_packaging:
-            terms.append(SimpleTerm(packaging, packaging.id))
-        return form.Fields(
-            Choice(__name__='packaging', vocabulary=SimpleVocabulary(terms),
-                   required=True))
-
-    def _renderHiddenPackagingField(self, packaging):
-        """Render a hidden input that fills in the packaging field."""
-        if not self.can_delete_packaging:
-            return None
-        vocabulary = self.form_fields['packaging'].field.vocabulary
-        return '<input type="hidden" name="field.packaging" value="%s" />' % (
-            vocabulary.getTerm(packaging).token)
-
-    def renderDeletePackagingAction(self):
-        """Render a submit input for the delete_packaging_action."""
-        assert self.can_delete_packaging, 'User cannot delete Packaging.'
-        return ('<input type="image" value="Delete Link" '
-                'src="/@@/remove" title="Delete upsteam link" '
-                'name="%s"/>' % self.delete_packaging_action.__name__)
-
-    def handleDeletePackagingError(self, action, data, errors):
-        """Handle errors on package link deletion.
-
-        If 'packaging' is not set in the form data, we assume that means the
-        provided Packaging id was not found, which should only happen if the
-        same Packaging object was concurrently deleted. In this case, we want
-        to display a more informative error message than the default 'Invalid
-        value'.
-        """
-        if data.get('packaging') is None:
-            self.setFieldError(
-                'packaging',
-                _("This upstream association was deleted already."))
-
-    @action(_("Delete Link"), name='delete_packaging',
-            failure=handleDeletePackagingError)
-    def delete_packaging_action(self, action, data):
-        """Delete a Packaging association."""
-        packaging = data['packaging']
-        productseries = packaging.productseries
-        distroseries = packaging.distroseries
-        getUtility(IPackagingUtil).deletePackaging(
-            productseries, packaging.sourcepackagename, distroseries)
-        self.request.response.addNotification(
-            _("Removed upstream association between ${product} "
-              "${productseries} and ${distroseries}.", mapping=dict(
-              product=productseries.product.displayname,
-              productseries=productseries.displayname,
-              distroseries=distroseries.displayname)))
 
=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-02-16 21:21:14 +0000
+++ lib/lp/registry/browser/product.py	2010-03-06 06:27:33 +0000
@@ -81,7 +81,6 @@
 from lp.registry.browser.distribution import UsesLaunchpadMixin
 from lp.registry.browser.menu import (
     IRegistryCollectionNavigationMenu, RegistryCollectionActionMenuBase)
-from lp.registry.browser.packaging import PackagingDeleteView
 from lp.answers.browser.faqtarget import FAQTargetNavigationMixin
 from canonical.launchpad.browser.feeds import FeedsMixin
 from lp.registry.browser.productseries import get_series_branch_error
@@ -95,13 +94,15 @@
     StructuralSubscriptionTargetTraversalMixin)
 from canonical.launchpad.mail import format_address, simple_sendmail
 from canonical.launchpad.webapp import (
-    ApplicationMenu, LaunchpadEditFormView, LaunchpadFormView, LaunchpadView,
-    Link, Navigation, StandardLaunchpadFacets, action, canonical_url,
-    custom_widget, enabled_with_permission, sorted_version_numbers,
+    ApplicationMenu, canonical_url, enabled_with_permission, LaunchpadView,
+    Link, Navigation, sorted_version_numbers, StandardLaunchpadFacets,
     stepthrough, stepto, structured)
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
+from canonical.launchpad.webapp.launchpadform import (
+    action, custom_widget, LaunchpadEditFormView, LaunchpadFormView,
+    ReturnToReferrerMixin)
 from canonical.launchpad.webapp.menu import NavigationMenu
 from canonical.widgets.popup import PersonPickerWidget
 from canonical.widgets.date import DateWidget
@@ -897,17 +898,11 @@
                 check_permission('launchpad.Commercial', self.context))
 
 
-class ProductPackagesView(PackagingDeleteView):
+class ProductPackagesView(LaunchpadView):
     """View for displaying product packaging"""
 
     label = 'Linked packages'
-
-    @property
-    def all_packaging(self):
-        """See `PackagingDeleteView`."""
-        for series in self.context.series:
-            for packaging in series.packagings:
-                yield packaging
+    page_title = label
 
     @cachedproperty
     def series_packages(self):
@@ -921,23 +916,11 @@
                 field: '<input type=''hidden' ...>},
                 }]
         """
-        # This method is a superset of all_packaging. While all_packaging will
-        # be called several times as data is mutated, series_packages should
-        # only be called during render().
         packaged_series = []
         for series in self.context.series:
             packagings = []
             for packaging in series.packagings:
-                form_id = 'delete-%s-%s-%s' % (
-                    packaging.distroseries.name,
-                    packaging.sourcepackagename.name,
-                    packaging.productseries.name,
-                    )
-                packaging_field = dict(
-                    packaging=packaging,
-                    form_id=form_id,
-                    field=self._renderHiddenPackagingField(packaging))
-                packagings.append(packaging_field)
+                packagings.append(packaging)
             packaged_series.append(dict(
                 series=series, packagings=packagings))
         return packaged_series
@@ -1262,7 +1245,8 @@
         return canonical_url(self.context)
 
 
-class ProductReviewLicenseView(ProductEditView, EditPrivateBugsMixin):
+class ProductReviewLicenseView(ReturnToReferrerMixin,
+                               ProductEditView, EditPrivateBugsMixin):
     """A view to review a project and change project privileges."""
     label = "Review project"
     field_names = [
@@ -1302,27 +1286,6 @@
         # supervisor.
         self.validate_private_bugs(data)
 
-    @property
-    def next_url(self):
-        """See `LaunchpadFormView`."""
-        # The referer header we want is only available before the view's
-        # form submits to itself. This field is a hidden input in the form.
-        referrer = self.request.form.get('next_url')
-        if referrer is None:
-            referrer = self.request.getHeader('referer')
-
-        if (referrer is not None
-            and referrer.startswith(self.request.getApplicationURL())):
-            return referrer
-        else:
-            return canonical_url(self.context)
-
-    @property
-    def cancel_url(self):
-        """See `LaunchpadFormView`."""
-        return self.next_url
-
-
 class ProductAddSeriesView(LaunchpadFormView):
     """A form to add new product series"""
 
@@ -1613,7 +1576,7 @@
         self.request.form['summary'] = data['summary']
 
 
-class ProjectAddStepTwo(StepView, ProductLicenseMixin):
+class ProjectAddStepTwo(StepView, ProductLicenseMixin, ReturnToReferrerMixin):
     """Step 2 (of 2) in the +new project add wizard."""
 
     _field_names = ['displayname', 'name', 'title', 'summary',
 
=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2010-02-23 19:43:58 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2010-03-06 06:27:33 +0000
@@ -12,7 +12,8 @@
     'SourcePackageFacets',
     'SourcePackageHelpView',
     'SourcePackageNavigation',
-    'SourcePackagePackaging',
+    'SourcePackageRemoveUpstreamView',
+    'SourcePackageUpstreamConnectionsView',
     'SourcePackageView',
     ]
 
@@ -40,7 +41,7 @@
 from lp.answers.browser.questiontarget import (
     QuestionTargetFacetMixin, QuestionTargetAnswersMenu)
 from lp.services.worlddata.interfaces.country import ICountry
-from lp.registry.interfaces.packaging import IPackaging
+from lp.registry.interfaces.packaging import IPackaging, IPackagingUtil
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.product import IProductSet
 from lp.registry.interfaces.productseries import IProductSeries
@@ -49,12 +50,15 @@
 from lp.translations.interfaces.potemplate import IPOTemplateSet
 from canonical.launchpad import _
 from canonical.launchpad.webapp import (
-    action, ApplicationMenu, custom_widget, GetitemNavigation,
-    LaunchpadFormView, Link, redirection, StandardLaunchpadFacets, stepto)
+    ApplicationMenu, GetitemNavigation, Link, redirection,
+    StandardLaunchpadFacets, stepto)
+from canonical.launchpad.webapp.launchpadform import (
+    action, custom_widget, LaunchpadFormView, ReturnToReferrerMixin)
 from canonical.launchpad.webapp import canonical_url
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.menu import structured
+from canonical.launchpad.webapp.publisher import LaunchpadView
 
 from canonical.lazr.utils import smartquote
 
@@ -108,7 +112,7 @@
     usedfor = ISourcePackage
     facet = 'overview'
     links = [
-        'distribution_source_package', 'edit_packaging',
+        'distribution_source_package', 'edit_packaging', 'remove_packaging',
         'changelog', 'builds', 'set_upstream',
         ]
 
@@ -124,6 +128,10 @@
     def edit_packaging(self):
         return Link('+edit-packaging', 'Change upstream link', icon='edit')
 
+    def remove_packaging(self):
+        return Link(
+            '+remove-packaging', 'Remove upstream link', icon='remove')
+
     def set_upstream(self):
         return Link("+edit-packaging", "Set upstream link", icon="add")
 
@@ -143,7 +151,7 @@
         return Link('+gethelp', 'Help and support options', icon='info')
 
 
-class SourcePackageChangeUpstreamStepOne(StepView):
+class SourcePackageChangeUpstreamStepOne(ReturnToReferrerMixin, StepView):
     """A view to set the `IProductSeries` of a sourcepackage."""
     schema = Interface
     _field_names = []
@@ -167,9 +175,8 @@
             IProductSeries['product'], default=default)
         self.form_fields += Fields(product_field)
 
-    @property
-    def cancel_url(self):
-        return canonical_url(self.context)
+    # Override ReturnToReferrerMixin.next_url.
+    next_url = None
 
     def main_action(self, data):
         """See `MultiStepView`."""
@@ -177,7 +184,7 @@
         self.request.form['product'] = data['product']
 
 
-class SourcePackageChangeUpstreamStepTwo(StepView):
+class SourcePackageChangeUpstreamStepTwo(ReturnToReferrerMixin, StepView):
     """A view to set the `IProductSeries` of a sourcepackage."""
     schema = IProductSeries
     _field_names = ['product']
@@ -196,10 +203,6 @@
     custom_widget('product', DropdownWidget, visible=False)
     custom_widget('productseries', LaunchpadRadioWidget)
 
-    @property
-    def cancel_url(self):
-        return canonical_url(self.context)
-
     def setUpFields(self):
         super(SourcePackageChangeUpstreamStepTwo, self).setUpFields()
 
@@ -261,12 +264,16 @@
             Fields(display_product_field, productseries_choice)
             + self.form_fields)
 
+    # Override ReturnToReferrerMixin.next_url until the main_action()
+    # is called.
+    next_url = None
+
     main_action_label = u'Change'
     def main_action(self, data):
         productseries = data['productseries']
         # Because it is part of a multistep view, the next_url can't
         # be set until the action is called, or it will skip the step.
-        self.next_url = canonical_url(self.context)
+        self.next_url = self._return_url
         if self.context.productseries == productseries:
             # There is nothing to do.
             return
@@ -282,6 +289,27 @@
     first_step = SourcePackageChangeUpstreamStepOne
 
 
+class SourcePackageRemoveUpstreamView(ReturnToReferrerMixin,
+                                      LaunchpadFormView):
+    """A view for removing the link to an upstream package."""
+
+    schema = Interface
+    field_names = []
+    label = 'Unlink an upstream project'
+    page_title = label
+
+    @action('Unlink')
+    def unlink(self, action, data):
+        old_series = self.context.productseries
+        getUtility(IPackagingUtil).deletePackaging(
+            self.context.productseries,
+            self.context.sourcepackagename,
+            self.context.distroseries)
+        self.request.response.addInfoNotification(
+            'Removed upstream association between %s and %s.' % (
+            old_series.title, self.context.distroseries.displayname))
+
+
 class SourcePackageView:
     """A view for (distro series) source packages."""
 
@@ -411,6 +439,7 @@
     def setUpFields(self):
         """See `LaunchpadFormView`."""
         super(SourcePackageAssociationPortletView, self).setUpFields()
+        self.request.annotations['show_edit_buttons'] = True
         # Find registered products that are similarly named to the source
         # package.
         product_vocab = getVocabularyRegistry().get(None, 'Product')
@@ -444,6 +473,10 @@
             upstream.displayname)
         self.next_url = self.request.getURL()
 
+
+class SourcePackageUpstreamConnectionsView(LaunchpadView):
+    """A shared view with upstream connection info."""
+
     @property
     def has_bugtracker(self):
         """Does the product have a bugtracker set?"""
 
=== modified file 'lib/lp/registry/browser/tests/packaging-views.txt'
--- lib/lp/registry/browser/tests/packaging-views.txt	2010-02-18 18:58:26 +0000
+++ lib/lp/registry/browser/tests/packaging-views.txt	2010-03-06 06:27:33 +0000
@@ -273,32 +273,19 @@
     >>> print view.label
     Linked packages
 
-The view defines the all_packages property used by the PackagingDeleteView
-to create a vocabulary.
-
-    >>> for package in view.all_packaging:
-    ...     print package.distroseries.name, package.productseries.name
-    grumpy hotter
-    hoary hotter
-
 The view provides the series_packages property that returns a list of
-dicts. Each dict as a series and a list of package dicts. The package dict
-contains the package and field for form actions.
+dicts. Each dict as a series and a list of packages.
 
-    >>> for series_dict in view.series_packages:
-    ...     print series_dict['series'].name
-    ...     for package_dict in series_dict['packagings']:
-    ...         print package_dict['packaging'].distroseries.name
-    ...         print package_dict['form_id']
-    ...         print package_dict['field']
+    >>> def print_packages(view):
+    ...     for series_dict in view.series_packages:
+    ...         print series_dict['series'].name
+    ...         for package in series_dict['packagings']:
+    ...             print package.distroseries.name
+    >>> print_packages(view)
     cold
     hotter
       grumpy
-        delete-grumpy-hot-hotter
-        <input type="hidden" name="field.packaging" .../>
       hoary
-        delete-hoary-thunderbird-hotter
-        <input type="hidden" name="field.packaging" .../>
     trunk
 
 The view provides the distro_packaging property that is a list of
@@ -306,40 +293,48 @@
 sorted by distribution with Ubuntu first and the rest in alphabetic
 order.
 
-    >>> view = create_initialized_view(product, name='+packages')
     >>> for distro_dict in view.distro_packaging:
     ...     print distro_dict['distribution'].name
     ubuntu
 
-The +packages named view descends from PackagingDeleteView to provide remove
-link actions for the product's linked packages.
-
-    >>> from lp.registry.browser.packaging import PackagingDeleteView
-
-    >>> isinstance(view, PackagingDeleteView)
-    True
-
 A packaging link can be deleted if the owner believes it is an error. The
 package linked to hoary is wrong; thunderbird is the wrong sourcepackage.
 
+    >>> from canonical.launchpad.testing.pages import find_tag_by_id
+    >>> view = create_initialized_view(
+    ...     product, name='+packages', principal=a_user)
+    >>> print_packages(view)
+    cold
+    hotter
+      grumpy
+      hoary
+    trunk
+
+    # There are links to the +remove-packaging page.
+    >>> table = find_tag_by_id(view.render(), 'packages-hotter')
+    >>> for link in table.findAll('a'):
+    ...     if '+remove-packaging' in link['href']:
+    ...         print link['href']
+    http://launchpad.dev/ubuntu/grumpy/+source/hot/+remove-packaging
+    http://launchpad.dev/ubuntu/hoary/+source/thunderbird/+remove-packaging
+
+    >>> [hoary_package] = [
+    ...     package for series_dict in view.series_packages
+    ...     for package in series_dict['packagings']
+    ...     if package.distroseries.name == 'hoary']
+    >>> form = {'field.actions.unlink': 'Unlink'}
+    >>> unlink_view = create_initialized_view(
+    ...     hoary_package.sourcepackage, name='+remove-packaging', form=form)
+    >>> unlink_view.errors
+    []
+
+    # The view has to be reloaded since view.series_packages is cached.
     >>> view = create_initialized_view(product, name='+packages')
-    >>> for package in view.all_packaging:
-    ...     print package.distroseries.name, package.productseries.name
-    grumpy hotter
-    hoary hotter
-
-    >>> [hoary_package] = [package for package in view.all_packaging
-    ...                     if package.distroseries.name == 'hoary']
-    >>> form = {
-    ...     'field.packaging': '%s' % hoary_package.id,
-    ...     'field.actions.delete_packaging': 'Delete upstream link',
-    ...     }
-    >>> view = create_initialized_view(product, name='+packages', form=form)
-    >>> view.errors
-    []
-    >>> for package in view.all_packaging:
-    ...     print package.distroseries.name, package.productseries.name
-    grumpy hotter
+    >>> print_packages(view)
+    cold
+    hotter
+      grumpy
+    trunk
 
 
 Distro series +packaging view
 
=== modified file 'lib/lp/registry/browser/tests/sourcepackage-views.txt'
--- lib/lp/registry/browser/tests/sourcepackage-views.txt	2010-02-18 20:39:01 +0000
+++ lib/lp/registry/browser/tests/sourcepackage-views.txt	2010-03-06 06:27:33 +0000
@@ -145,6 +145,7 @@
     >>> print view.request.response.notifications
     []
 
+
 Upstream associations portlet
 -----------------------------
 
@@ -163,12 +164,18 @@
 
     >>> from canonical.launchpad.testing.pages import (
     ...     extract_text, find_tag_by_id)
-    >>> content = extract_text(find_tag_by_id(view.render(), 'upstreams'))
-    >>> print content
-    Bonkers project
+    >>> content = find_tag_by_id(view.render(), 'upstreams')
+    >>> for link in content.findAll('a'):
+    ...     print link['href']
+    /bonkers
+    /bonkers/crazy
+    .../+source/bonkers/+edit-packaging
+    .../+source/bonkers/+remove-packaging
+
+    >>> print extract_text(content)
+    Bonkers...crazy...
     Bug supervisor: no
     Bug tracker: no
-    Bonkers crazy series
     Branch: no
 
 A new source project that is not linked to an upstream will result in
@@ -211,6 +218,9 @@
     Lernid Dev...
 
 
+Upstream connections view
+-------------------------
+
 The view includes a property for determining if the project has a bug
 tracker, though the rules are somewhat complicated.
 
@@ -226,7 +236,8 @@
     >>> package = factory.makeSourcePackage(
     ...     sourcepackagename=sourcepackagename, distroseries=distroseries)
 
-    >>> view = create_initialized_view(package, name='+portlet-associations')
+    >>> view = create_initialized_view(
+    ...     package, name='+upstream-connections')
 
     >>> print package.productseries
     None
@@ -242,7 +253,8 @@
 If a product is not part of a project group and its bug tracker is not
 set then the view property is false.
 
-    >>> view = create_initialized_view(package, name='+portlet-associations')
+    >>> view = create_initialized_view(
+    ...     package, name='+upstream-connections')
 
     >>> print product.official_malone
     False
@@ -285,3 +297,37 @@
     >>> project.bugtracker = bugtracker
     >>> print view.has_bugtracker
     True
+
+
+Remove packaging view
+---------------------
+
+This view allows removal of the packaging link from the sourcepackage
+to the project series.
+
+    >>> view = create_initialized_view(package, name='+remove-packaging')
+    >>> print view.label
+    Unlink an upstream project
+
+    >>> print view.page_title
+    Unlink an upstream project
+
+    >>> print view.cancel_url
+    http://launchpad.dev/youbuntu/wonky/+source/stinkypackage
+
+    >>> form = {'field.actions.unlink': 'Unlink'}
+    >>> view = create_initialized_view(
+    ...     package, name='+remove-packaging', form=form,
+    ...     principal=product.owner)
+    >>> view.errors
+    []
+
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+    Removed upstream association between Stinky stinkyseries series and Wonky.
+
+    >>> view = create_initialized_view(package, name='+portlet-associations')
+    >>> print extract_text(find_tag_by_id(view.render(), 'no-upstreams'))
+    There are no projects registered in Launchpad that are a potential
+    match for this source package. Can you help us find one?
+    Set upstream link
 
=== modified file 'lib/lp/registry/browser/tests/test_packaging.py'
--- lib/lp/registry/browser/tests/test_packaging.py	2009-10-23 12:53:21 +0000
+++ lib/lp/registry/browser/tests/test_packaging.py	2010-03-06 06:27:33 +0000
@@ -55,8 +55,10 @@
         # Delete the packaging
         user_browser = self.user_browser
         user_browser.open('http://launchpad.dev/ubuntu/+source/alsa-utils')
-        form = user_browser.getForm("delete_warty_alsa-utils_trunk")
-        form.getControl(name="field.actions.delete_packaging").click()
+        link = user_browser.getLink(
+            url='/ubuntu/warty/+source/alsa-utils/+remove-packaging')
+        link.click()
+        user_browser.getControl('Unlink').click()
         # Check that the change was committed.
         login('[e-mail]')
         self.assertFalse(packaging_util.packagingEntryExists(
 
=== modified file 'lib/lp/registry/model/productseries.py'
--- lib/lp/registry/model/productseries.py	2010-02-25 21:37:02 +0000
+++ lib/lp/registry/model/productseries.py	2010-03-06 06:27:33 +0000
@@ -412,8 +412,10 @@
 
         # ok, we didn't find a packaging record that matches, let's go ahead
         # and create one
-        pkg = Packaging(distroseries=distroseries,
-            sourcepackagename=sourcepackagename, productseries=self,
+        pkg = Packaging(
+            distroseries=distroseries,
+            sourcepackagename=sourcepackagename,
+            productseries=self,
             packaging=PackagingType.PRIME,
             owner=owner)
         pkg.sync()  # convert UTC_NOW to actual datetime
 
=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2010-02-25 21:37:02 +0000
+++ lib/lp/registry/model/sourcepackage.py	2010-03-06 06:27:33 +0000
@@ -477,10 +477,11 @@
             target.datecreated = UTC_NOW
         else:
             # ok, we need to create a new one
-            Packaging(distroseries=self.distroseries,
-            sourcepackagename=self.sourcepackagename,
-            productseries=productseries, owner=user,
-            packaging=PackagingType.PRIME)
+            Packaging(
+                distroseries=self.distroseries,
+                sourcepackagename=self.sourcepackagename,
+                productseries=productseries, owner=user,
+                packaging=PackagingType.PRIME)
         # and make sure this change is immediately available
         flush_database_updates()
 
 
=== modified file 'lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt'
--- lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt	2010-02-25 16:36:02 +0000
+++ lib/lp/registry/stories/distroseries/xx-show-distroseries-packaging.txt	2010-03-06 06:27:33 +0000
@@ -17,12 +17,13 @@
     Source Package   Upstream Project   Upstream Contributor Connections
     netapplet
       NetApplet ... The Novell Network Applet
-        NetApplet ... project:  Bug supervisor: no   Bug tracker: yes
-        NetApplet trunk series:  Branch: no
+        GNOME...NetApplet...trunk
+        ...Bug supervisor: no   Bug tracker: yes Branch: no
     evolution
       Evolution ... Evolution is an email client, addressbook ...
-        Evolution ... project: Bug supervisor: no   Bug tracker: yes
-        Evolution trunk series: Branch: yes   Translations: no
+        GNOME...Evolution...trunk
+        ...Bug supervisor: no   Bug tracker: yes
+        Branch: yes   Translations: no
 
 Any use can see that this page is related to the needs packaging report. It
 is linked, but the link to this page is not enabled.
 
=== modified file 'lib/lp/registry/stories/packaging/xx-distributionsourcepackage-packaging-concurrent-deletion.txt'
--- lib/lp/registry/stories/packaging/xx-distributionsourcepackage-packaging-concurrent-deletion.txt	2009-10-23 12:53:21 +0000
+++ lib/lp/registry/stories/packaging/xx-distributionsourcepackage-packaging-concurrent-deletion.txt	2010-03-06 06:27:33 +0000
@@ -16,33 +16,28 @@
 Then the user click the "Delete Link" button in the first tab. The
 deletion succeeds and the usual informational message is displayed.
 
-    >>> form = first_browser.getForm("delete_warty_alsa-utils_trunk")
-    >>> form.getControl(name="field.actions.delete_packaging").click()
+    >>> link = first_browser.getLink(
+    ...     url='/ubuntu/warty/+source/alsa-utils/+remove-packaging')
+    >>> link.click()
+    >>> first_browser.getControl('Unlink').click()
     >>> content = first_browser.contents
     >>> for tag in find_tags_by_class(content, 'error'):
     ...     print extract_text(tag)
     >>> for tag in find_tags_by_class(content, 'informational'):
     ...     print extract_text(tag)
-    Removed upstream association between alsa-utils trunk and Warty.
+    Removed upstream association between alsa-utils trunk series and Warty.
 
 A few minutes later, the user sees the same packaging association in the
 second tab, and clicks the "Delete Link" button again.
 
 The packaging object has been deleted already, so this action cannot
-succeed. We yield a more useful error message than the mysterious
-"Invalid value" displayed by default.
-
-XXX: We would like to display an informational message and no error
-message, but it would be too much trouble for a corner case like this.
-So we resort to just displaying a helpful error message.
--- David Allouche 2007-12-07
-
-    >>> form = second_browser.getForm("delete_warty_alsa-utils_trunk")
-    >>> form.getControl(name="field.actions.delete_packaging").click()
+succeed.
+
+    >>> second_browser.getLink(
+    ...     url='/ubuntu/warty/+source/alsa-utils/+remove-packaging').click()
     >>> content = second_browser.contents
     >>> for tag in find_tags_by_class(content, 'informational'):
     ...     print extract_text(tag)
     >>> for tag in find_tags_by_class(content, 'error'):
     ...     print extract_text(tag)
-    There is 1 error.
     This upstream association was deleted already.
 
=== modified file 'lib/lp/registry/stories/packaging/xx-distributionsourcepackage-packaging.txt'
--- lib/lp/registry/stories/packaging/xx-distributionsourcepackage-packaging.txt	2009-10-23 12:53:21 +0000
+++ lib/lp/registry/stories/packaging/xx-distributionsourcepackage-packaging.txt	2010-03-06 06:27:33 +0000
@@ -15,6 +15,7 @@
     The Hoary Hedgehog Release (active development)     Set upstream link
       1.0.9a-4ubuntu1 release (main) ... weeks ago
     The Warty Warthog Release (current stable release)  alsa-utils trunk series
+    ...
       1.0.8-1ubuntu1  release (main) ... weeks ago
       1.0.9a-4        release (main) ... weeks ago
 
@@ -26,9 +27,10 @@
 packaging links.
 
     >>> user_browser.open('http://launchpad.dev/ubuntu/+source/alsa-utils')
-    >>> form = user_browser.getForm("delete_warty_alsa-utils_trunk")
-    >>> print form.getControl(name="field.actions.delete_packaging")
-    <ImageControl name='field.actions.delete_packaging' type='image'>
+    >>> link = user_browser.getLink(
+    ...     url='/ubuntu/warty/+source/alsa-utils/+remove-packaging')
+    >>> print link
+    <Link text='Remove upstream link'...
 
 This button is not displayed to anonymous users.
 
@@ -40,14 +42,16 @@
 
 Clicking this button deletes the corresponding packaging association.
 
-    >>> form = user_browser.getForm("delete_warty_alsa-utils_trunk")
-    >>> form.getControl(name="field.actions.delete_packaging").click()
+    >>> link = user_browser.getLink(
+    ...     url='/ubuntu/warty/+source/alsa-utils/+remove-packaging')
+    >>> link.click()
+    >>> user_browser.getControl('Unlink').click()
     >>> content = user_browser.contents
     >>> for tag in find_tags_by_class(content, 'error'):
     ...     print extract_text(tag)
     >>> for tag in find_tags_by_class(content, 'informational'):
     ...     print extract_text(tag)
-    Removed upstream association between alsa-utils trunk and Warty.
+    Removed upstream association between alsa-utils trunk series and Warty.
     >>> print extract_text(find_tag_by_id(content, 'packages_list'))
     The Hoary Hedgehog Release (active development)     Set upstream link
       1.0.9a-4ubuntu1 release (main) ... weeks ago
 
=== modified file 'lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt'
--- lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2010-02-18 20:41:01 +0000
+++ lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2010-03-06 06:27:33 +0000
@@ -29,11 +29,9 @@
     >>> user_browser.getControl("Change").click()
     >>> print extract_text(find_tag_by_id(
     ...     user_browser.contents, 'upstreams'))
-    Mozilla Thunderbird ... project
-    Project Group: the Mozilla Project
+    the Mozilla Project...Mozilla Thunderbird...trunk...
     Bug supervisor: no
     Bug tracker: no
-    Mozilla Thunderbird trunk series
     Branch: no
     Translations: no
 
 
=== modified file 'lib/lp/registry/stories/product/xx-product-package-pages.txt'
--- lib/lp/registry/stories/product/xx-product-package-pages.txt	2010-01-12 22:34:51 +0000
+++ lib/lp/registry/stories/product/xx-product-package-pages.txt	2010-03-06 06:27:33 +0000
@@ -30,8 +30,8 @@
     >>> print extract_text(find_tag_by_id(
     ...     evo_owner.contents, 'packages-trunk'))
     Distribution  Distribution series  Source package  Version
-    Ubuntu        Warty (4.10)         evolution
-    Ubuntu        Hoary (5.04)         evolution       1.0
+    Ubuntu        Warty (4.10)         evolution                Remove...
+    Ubuntu        Hoary (5.04)         evolution       1.0      Remove...
 
     >>> evo_owner.getLink(url='/ubuntu/hoary/+source/evolution') is not None
     True
@@ -54,16 +54,19 @@
 
 Packaging links can be deleted if they were created in error.
 
-    >>> form = evo_owner.getForm("delete-warty-evolution-trunk")
-    >>> form.getControl(name="field.actions.delete_packaging").click()
-    >>> print evo_owner.title
-    Linked packages ...
+    >>> evo_owner.getLink(
+    ...     url='/ubuntu/warty/+source/evolution/+remove-packaging').click()
+    >>> print evo_owner.title
+    Unlink an upstream project...
+    >>> evo_owner.getControl('Unlink').click()
+    >>> print evo_owner.title
+    Linked packages...
 
     >>> for message in get_feedback_messages(evo_owner.contents):
     ...     print message
-    Removed upstream association between Evolution trunk and Warty.
+    Removed upstream association between Evolution trunk series and Warty.
 
     >>> print extract_text(find_tag_by_id(
     ...     evo_owner.contents, 'packages-trunk'))
     Distribution  Distribution series  Source package  Version
-    Ubuntu        Hoary (5.04)         evolution       1.0
+    Ubuntu        Hoary (5.04)         evolution       1.0     Remove...
 
=== modified file 'lib/lp/registry/stories/productseries/xx-productseries-delete.txt'
--- lib/lp/registry/stories/productseries/xx-productseries-delete.txt	2009-12-14 13:49:03 +0000
+++ lib/lp/registry/stories/productseries/xx-productseries-delete.txt	2010-03-06 06:27:33 +0000
@@ -46,8 +46,10 @@
     Mozilla Firefox in Launchpad
 
     >>> owner_browser.getLink('All packages').click()
-    >>> owner_browser.getControl(
-    ...     name='field.actions.delete_packaging', index=1).click()
+    >>> link = owner_browser.getLink(
+    ...     url='/ubuntu/warty/+source/mozilla-firefox/+remove-packaging')
+    >>> link.click()
+    >>> owner_browser.getControl('Unlink').click()
 
 Then he returns to delete trunk. He is informed that deletion is permanent,
 and that the milestones, releases, and files will also be deleted. The
 
=== modified file 'lib/lp/registry/templates/distributionsourcepackage-index.pt'
--- lib/lp/registry/templates/distributionsourcepackage-index.pt	2010-02-09 15:38:13 +0000
+++ lib/lp/registry/templates/distributionsourcepackage-index.pt	2010-03-06 06:27:33 +0000
@@ -28,21 +28,6 @@
 </tal:side>
 
 <tal:main metal:fill-slot="main">
-  <p class="error message"
-     tal:condition="view/errors"
-     tal:content="view/error_count" />
-  <p class="error message"
-     tal:repeat="form_wide_error view/form_wide_errors"
-     tal:content="structure form_wide_error">
-     Schema validation errors.
-  </p>
-  <p class="error message"
-     tal:define="error python:view.getFieldError('packaging')"
-     tal:condition="error"
-     tal:content="structure error">
-     Field specific error for the hidden packaging field.
-  </p>
-
   <div class="top-portlet" id="bugs-and-questions-summary"
        tal:define="newbugs context/new_bugtasks/count;
                    open_questions view/open_questions/count">
@@ -141,25 +126,14 @@
           <a tal:attributes="href row/series_package/fmt:url"
              tal:content="row/distroseries/title"/>
           (<span tal:replace="row/distroseries/status/title/lower"/>)
-          <div style="float:right;">
+          <div style="float:right; white-space: nowrap">
             <a tal:condition="not: row/packaging"
                tal:replace="structure row/series_package/menu:overview/set_upstream/fmt:link"/>
             <tal:has_packaging condition="row/packaging">
               <img tal:replace="structure row/packaging/productseries/image:icon"/>
               <a tal:replace="structure row/packaging/productseries/fmt:link"/>
-              <form style="display: inline"
-                    method="POST"
-                    tal:condition="row/hidden_packaging_field"
-                    tal:attributes="action request/URL;
-                                    id row/delete_packaging_form_id">
-                <tal:hidden replace="structure row/hidden_packaging_field" />
-                <tal:action replace="structure view/renderDeletePackagingAction" />
-              </form>
-              <a tal:attributes="
-                href row/series_package/menu:overview/edit_packaging/url;
-                title string:Edit upsteam link">
-                <img src="/@@/edit"/>
-              </a>
+              <a tal:replace="structure row/series_package/menu:overview/edit_packaging/fmt:icon"/>
+              <a tal:replace="structure row/series_package/menu:overview/remove_packaging/fmt:icon" />
             </tal:has_packaging>
           </div><!--float right-->
         </td>
 
=== modified file 'lib/lp/registry/templates/distroseries-packaging.pt'
--- lib/lp/registry/templates/distroseries-packaging.pt	2010-02-16 19:07:42 +0000
+++ lib/lp/registry/templates/distroseries-packaging.pt	2010-03-06 06:27:33 +0000
@@ -18,7 +18,7 @@
         <p>
           The packages are listed by priority based on the greatest need to
           forward bugs, sync translations, or specify the latest
-          development branch. 
+          development branch.
         </p>
 
         <ul id="related-pages" class="horizontal">
@@ -72,42 +72,7 @@
                     tal:condition="product/summary"
                     tal:content="product/summary"/>
                 </td>
-
-                <td>
-                  <dl>
-                    <dt>
-                      <a tal:replace="structure product/fmt:link" /> project:
-                    </dt>
-                    <dd title="Project bug supervisor">
-                      Bug supervisor:
-                      <tal:yes-no
-                        replace="structure product/bug_supervisor/image:boolean" />
-                    </dd>
-                    <dd title="Project bug tracker"
-                      tal:define="bool product/project|bugtracker|product/bugtracker|product/official_malone">
-                      Bug tracker:
-                      <tal:yes-no replace="structure bool/image:boolean"/>
-                    </dd>
-                  </dl>
-                </td>
-
-                <td>
-                  <dl>
-                    <dt style="margin-bottom: 6px;">
-                      <a tal:replace="structure series/fmt:link" />:
-                    </dt>
-                    <dd title="Series branch">
-                      Branch:
-                      <tal:yes-no replace="structure series/branch/image:boolean"/>
-                    </dd>
-                    <dd title="Series translations auto import"
-                      tal:condition="translations"
-                      tal:define="bool not:series/translations_autoimport_mode/enumvalue:NO_IMPORT">
-                      Translations:
-                      <tal:yes-no replace="structure bool/image:boolean"/>
-                    </dd>
-                  </dl>
-                </td>
+                <td tal:content="structure package/@@+upstream-connections"/>
               </tr>
             </tal:packaging>
           </tbody>
 
=== modified file 'lib/lp/registry/templates/product-packages.pt'
--- lib/lp/registry/templates/product-packages.pt	2010-01-11 20:58:42 +0000
+++ lib/lp/registry/templates/product-packages.pt	2010-03-06 06:27:33 +0000
@@ -40,16 +40,11 @@
             <th>Distribution series</th>
             <th>Source package</th>
             <th>Version</th>
-            <th style="width: 1em;"
-              tal:condition="view/can_delete_packaging">&nbsp;</th>
+            <th>&nbsp;</th>
           </tr>
         </thead>
         <tbody>
-          <tr tal:repeat="packaging_dict packagings">
-          <tal:packaging_field
-            define="packaging packaging_dict/packaging;
-                    form_id packaging_dict/form_id;
-                    field packaging_dict/field">
+          <tr tal:repeat="packaging packagings">
             <td>
               <a tal:replace="structure packaging/distroseries/distribution/fmt:link" />
             </td>
@@ -69,17 +64,11 @@
               <tal:currentrelease
                 replace="packaging/sourcepackage/currentrelease/version|nothing">
                   2.3.4-1
-              </tal:currentrelease>       
-            </td>
-            <td tal:condition="view/can_delete_packaging">
-              <form style="display: inline" method="post"
-                tal:attributes="action request/URL;
-                                id form_id">
-                <tal:hidden replace="structure field" />
-                <tal:action replace="structure view/renderDeletePackagingAction" />
-              </form>
-            </td>
-          </tal:packaging_field>
+              </tal:currentrelease>
+            </td>
+            <td>
+              <a tal:replace="structure packaging/sourcepackage/menu:overview/remove_packaging/fmt:icon" />
+            </td>
           </tr>
         </tbody>
       </table>
@@ -99,7 +88,7 @@
     <h2>Packages by distribution</h2>
 
   <tal:distribution repeat="distro view/distro_packaging">
-    
+
     <h3>
       <a tal:attributes="href distro/distribution/fmt:url"
         tal:content="distro/distribution/title">Ubuntu Linux</a>
 
=== modified file 'lib/lp/registry/templates/sourcepackage-portlet-associations.pt'
--- lib/lp/registry/templates/sourcepackage-portlet-associations.pt	2010-02-16 19:13:31 +0000
+++ lib/lp/registry/templates/sourcepackage-portlet-associations.pt	2010-03-06 06:27:33 +0000
@@ -10,47 +10,7 @@
     <div class="portletBody portletContent"
          tal:define="series context/productseries">
       <tal:has_series condition="series">
-        <div id="upstreams" class="two-column-list">
-          <dl>
-            <dt>
-              <a tal:replace="structure series/product/fmt:link" /> project
-            </dt>
-
-            <tal:has_pg define="project series/product/project"
-                        condition="project">
-              <dd title="Project group">
-                Project Group:
-                <a tal:replace="structure project/fmt:link" />
-              </dd>
-            </tal:has_pg>
-
-            <dd title="Bug supervisor">
-              Bug supervisor:
-              <tal:yes-no replace="structure series/product/bug_supervisor/image:boolean"/>
-            </dd>
-
-            <dd title="Bug tracker">
-              Bug tracker:
-              <tal:yes-no replace="structure view/has_bugtracker/image:boolean"/>
-            </dd>
-          </dl>
-          <dl>
-            <dt>
-              <a tal:replace="structure series/fmt:link" />
-            </dt>
-            <dd title="Series branch">
-              Branch:
-              <tal:yes-no replace="structure series/branch/image:boolean"/>
-            </dd>
-            <dd title="Series translations auto import"
-                tal:condition="context/getTranslationTemplates"
-                tal:define="bool not:series/translations_autoimport_mode/enumvalue:NO_IMPORT">
-              Translations:
-              <tal:yes-no replace="structure bool/image:boolean"/>
-            </dd>
-          </dl>
-
-        </div>
+        <div tal:content="structure context/@@+upstream-connections"/>
 
         <ul class="horizontal">
           <li>
@@ -58,12 +18,6 @@
                tal:attributes="href series/product/menu:overview/packages/fmt:url"
                >Show upstream links</a>
           </li>
-          <li>
-            <a class="sprite edit"
-               tal:attributes="
-                 href context/menu:overview/edit_packaging/fmt:url"
-               >Change upstream project and series</a>
-          </li>
         </ul>
       </tal:has_series>
 
 
=== added file 'lib/lp/registry/templates/sourcepackage-remove-packaging.pt'
--- lib/lp/registry/templates/sourcepackage-remove-packaging.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/sourcepackage-remove-packaging.pt	2010-03-06 06:27:33 +0000
@@ -0,0 +1,34 @@
+<html
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  metal:use-macro="view/macro:page/main_only"
+>
+
+<body>
+
+<div metal:fill-slot="main">
+
+  <div tal:condition="not: context/productseries"
+       class="error">
+    This upstream association was deleted already.
+  </div>
+  <div tal:condition="context/productseries">
+    <div metal:use-macro="context/@@launchpad_form/form">
+      <div metal:fill-slot="extra_info">
+        <p>
+          Do you want to remove the upstream link to
+          <a tal:replace="structure context/productseries/fmt:link"/>?
+        </p>
+        <p>
+        Links from distribution packages to upstream project series let
+        distribution and upstream maintainers share bugs, patches, and
+        translations efficiently.
+        </p>
+      </div>
+    </div>
+  </div>
+
+</div>
+</body>
+</html>
 
=== added file 'lib/lp/registry/templates/sourcepackage-upstream-connections.pt'
--- lib/lp/registry/templates/sourcepackage-upstream-connections.pt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/templates/sourcepackage-upstream-connections.pt	2010-03-06 06:27:33 +0000
@@ -0,0 +1,63 @@
+<tal:root
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  omit-tag="">
+
+<tal:comment condition="nothing">
+  view.request.annotations['show_edit_buttons'] can be set in views
+  that include this page to display the edit and remove buttons.
+</tal:comment>
+<div id="upstreams" tal:define="series context/productseries">
+  <dl>
+    <dd>
+      <tal:has_pg condition="series/product/project">
+        <a tal:replace="structure series/product/project/fmt:link" /> &rArr;
+      </tal:has_pg>
+      <a tal:replace="structure series/product/fmt:link" /> &rArr;
+      <a tal:content="series/name"
+          tal:attributes="href series/fmt:url" />
+      <span tal:condition="request/annotations/show_edit_buttons | nothing">
+        <a tal:replace="
+          structure context/menu:overview/edit_packaging/fmt:icon" />
+        <a tal:replace="
+          structure context/menu:overview/remove_packaging/fmt:icon " />
+      </span>
+    </dd>
+  </dl>
+
+  <style>
+    #upstream-fields dd {
+      margin: 0;
+      padding: 0;
+    }
+  </style>
+  <div id="upstream-fields" class="two-column-list">
+    <dl>
+      <dd title="Bug supervisor">
+        Bug supervisor:
+        <tal:yes-no replace="structure series/product/bug_supervisor/image:boolean"/>
+      </dd>
+
+      <dd title="Bug tracker">
+        Bug tracker:
+        <tal:yes-no replace="structure view/has_bugtracker/image:boolean"/>
+      </dd>
+    </dl>
+    <dl>
+      <dd title="Series branch">
+        Branch:
+        <tal:yes-no replace="structure series/branch/image:boolean"/>
+      </dd>
+      <dd title="Series translations auto import"
+          tal:condition="context/getTranslationTemplates"
+          tal:define="bool not:series/translations_autoimport_mode/enumvalue:NO_IMPORT">
+        Translations:
+        <tal:yes-no replace="structure bool/image:boolean"/>
+      </dd>
+    </dl>
+
+  </div>
+</div>
+
+</tal:root>
 
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt'
--- lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt	2010-02-15 10:40:56 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-distroseries-sources.txt	2010-03-06 06:27:33 +0000
@@ -72,11 +72,9 @@
 Product, Branches, and Bugs:
 
   >>> print extract_text(find_tag_by_id(browser.contents, 'upstreams'))
-  Mozilla Firefox ... project
-  Project Group: the Mozilla Project
+  the Mozilla Project...Mozilla Firefox...trunk...
   Bug supervisor: no
   Bug tracker: yes
-  Mozilla Firefox trunk series
   Branch: no
 
 The user can also download the files for the "currentrelease" (last