Merge lp:~thumper/launchpad/fix-canonical-url into lp:launchpad

[Tim Penhey]

Fix canonical_url to look on the right rootsite for views.

This branch changes the way that canonical_url does the view_name check.

Currently it checks using the current browser request to define the layer rather than the layer that is defined by the canonical_url_data of the context object.

Instead we lookup the layer for the given rootsite and use that to query for the existence of the view.

Pre-impl call: mwhudson, and the mailing list thread: https://lists.launchpad.net/launchpad-dev/msg04345.html

Tests:
  canonical_url

[Jeroen T. Vermeulen (jtv)]

I'll trust you on this not breaking any tests (of course you'll want to run a lot more than just the canonical_url one!) and on the tests being sufficient.

Discussed on IRC: incurring an exception for the default case isn't likely to be expensive.

review: Approve

=== modified file 'lib/canonical/launchpad/doc/canonical_url.txt'
--- lib/canonical/launchpad/doc/canonical_url.txt	2009-11-14 22:44:07 +0000
+++ lib/canonical/launchpad/doc/canonical_url.txt	2010-08-20 05:52:56 +0000
@@ -28,11 +28,11 @@
 Add a view for Country/+map.
 
     >>> from zope.component import provideAdapter
-    >>> from zope.publisher.interfaces.http import IHTTPApplicationRequest
+    >>> from zope.publisher.interfaces.browser import IDefaultBrowserLayer
     >>> class CountryMapView(object):
     ...     def __init__(self, country, request):
     ...         pass
-    >>> provideAdapter(CountryMapView, (ICountry, IHTTPApplicationRequest),
+    >>> provideAdapter(CountryMapView, (ICountry, IDefaultBrowserLayer),
     ...                name='+map', provides=Interface)
 
 Define a navigation for the Country URL.
@@ -56,7 +56,7 @@
     ...         town.name = 'Greenwich'
     ...         return town
     >>> provideAdapter(
-    ...     CountryNavigation, [ICountry, IHTTPApplicationRequest], 
+    ...     CountryNavigation, [ICountry, IDefaultBrowserLayer], 
     ...     IBrowserPublisher)
 
 Put the interfaces into canonical.launchpad.ftests, ensuring that there
@@ -352,6 +352,7 @@
 getApplicationURL() from
 zope.publisher.interfaces.http.IHTTPApplicationRequest.
 
+    >>> from zope.publisher.interfaces.http import IHTTPApplicationRequest
     >>> class FakeRequest:
     ...
     ...     implements(IHTTPApplicationRequest)
@@ -468,7 +469,7 @@
     Traceback (most recent call last):
       ...
     AssertionError: Name "+does-not-exist" is not registered as a view 
-    or navigation step for "Country".
+    or navigation step for "Country" on "bugs".
 
 
 == The 'nearest' helper function ==

=== modified file 'lib/canonical/launchpad/webapp/publisher.py'
--- lib/canonical/launchpad/webapp/publisher.py	2010-08-02 02:13:52 +0000
+++ lib/canonical/launchpad/webapp/publisher.py	2010-08-20 05:52:56 +0000
@@ -31,14 +31,22 @@
 from zope.app.publisher.interfaces.xmlrpc import IXMLRPCView
 from zope.app.publisher.xmlrpc import IMethodPublisher
 from zope.component import getUtility, queryMultiAdapter
-from zope.interface import implements
+from zope.component.interfaces import ComponentLookupError
+from zope.interface import directlyProvides, implements
 from zope.interface.advice import addClassAdvisor
 from zope.publisher.interfaces import NotFound
-from zope.publisher.interfaces.browser import IBrowserPublisher
+from zope.publisher.interfaces.browser import (
+    IBrowserPublisher,
+    IDefaultBrowserLayer,
+    )
 from zope.security.checker import ProxyFactory, NamesChecker
 from zope.traversing.browser.interfaces import IAbsoluteURL
 
-from canonical.launchpad.layers import setFirstLayer, WebServiceLayer
+from canonical.launchpad.layers import (
+    LaunchpadLayer,
+    WebServiceLayer,
+    setFirstLayer,
+    )
 from canonical.launchpad.webapp.vhosts import allvhosts
 from canonical.launchpad.webapp.interfaces import (
     ICanonicalUrlData, ILaunchBag, ILaunchpadApplication, ILaunchpadContainer,
@@ -408,6 +416,29 @@
     __call__ = __str__
 
 
+def layer_for_rootsite(rootsite):
+    """Return the registered layer for the specified rootsite.
+
+    'code' -> lp.code.publisher.CodeLayer
+    'translations' -> lp.translations.publisher.TranslationsLayer
+    et al.
+
+    The layer is defined in ZCML using a named utility with the name of the
+    rootsite, and providing IDefaultBrowserLayer.  If there is no utility
+    defined with the specified name, then LaunchpadLayer is returned.
+    """
+    try:
+        return getUtility(IDefaultBrowserLayer, rootsite)
+    except ComponentLookupError:
+        return LaunchpadLayer
+
+
+class FakeRequest:
+    """Used solely to provide a layer for the view check in canonical_url."""
+
+    form_ng = None
+
+
 def canonical_url(
     obj, request=None, rootsite=None, path_only_if_possible=False,
     view_name=None, force_local_path=False):
@@ -472,14 +503,14 @@
             request = current_request
 
     if view_name is not None:
-        assert request is not None, (
-            "Cannot check view_name parameter when the request is not "
-            "available.")
-
+        # Make sure that the view is registered for the site requested.
+        fake_request = FakeRequest()
+        directlyProvides(fake_request, layer_for_rootsite(rootsite))
         # Look first for a view.
-        if queryMultiAdapter((obj, request), name=view_name) is None:
+        if queryMultiAdapter((obj, fake_request), name=view_name) is None:
             # Look if this is a special name defined by Navigation.
-            navigation = queryMultiAdapter((obj, request), IBrowserPublisher)
+            navigation = queryMultiAdapter(
+                (obj, fake_request), IBrowserPublisher)
             if isinstance(navigation, Navigation):
                 all_names = navigation.all_traversal_and_redirection_names
             else:
@@ -487,10 +518,13 @@
             if view_name not in all_names:
                 raise AssertionError(
                     'Name "%s" is not registered as a view or navigation '
-                    'step for "%s".' % (view_name, obj.__class__.__name__))
+                    'step for "%s" on "%s".' % (
+                        view_name, obj.__class__.__name__, rootsite))
         urlparts.insert(0, view_name)
 
     if request is None:
+        # Yes this really does need to be here, as rootsite can be None, and
+        # we don't want to make the getRootURL from the request break.
         if rootsite is None:
             rootsite = 'mainsite'
         root_url = allvhosts.configs[rootsite].rooturl

=== modified file 'lib/lp/answers/configure.zcml'
--- lib/lp/answers/configure.zcml	2010-08-18 21:11:49 +0000
+++ lib/lp/answers/configure.zcml	2010-08-20 05:52:56 +0000
@@ -11,8 +11,12 @@
   <include package=".browser" />
 
   <publisher
-     name="answers"
-     factory="lp.answers.publisher.answers_request_publication_factory"/>
+      name="answers"
+      factory="lp.answers.publisher.answers_request_publication_factory"/>
+  <utility
+      component="lp.answers.publisher.AnswersLayer"
+      provides="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+      name="answers" />
 
     <subscriber
         for=".interfaces.question.IQuestion

=== modified file 'lib/lp/blueprints/configure.zcml'
--- lib/lp/blueprints/configure.zcml	2010-07-16 16:58:55 +0000
+++ lib/lp/blueprints/configure.zcml	2010-08-20 05:52:56 +0000
@@ -9,12 +9,17 @@
     xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
     xmlns:lp="http://namespaces.canonical.com/lp"
     i18n_domain="launchpad">
-    <include
-        package=".browser"/>
-
-    <publisher
-       name="blueprints"
-       factory="lp.blueprints.publisher.blueprints_request_publication_factory"/>
+
+  <include package=".browser"/>
+
+  <publisher
+      name="blueprints"
+      factory="lp.blueprints.publisher.blueprints_request_publication_factory"/>
+  <utility
+      component="lp.blueprints.publisher.BlueprintsLayer"
+      provides="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+      name="blueprints" />
+
 
     <lp:help-folder
         folder="help" type="lp.blueprints.publisher.BlueprintsLayer" />

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2010-08-02 17:48:13 +0000
+++ lib/lp/bugs/configure.zcml	2010-08-20 05:52:56 +0000
@@ -9,12 +9,16 @@
     xmlns:xmlrpc="http://namespaces.zope.org/xmlrpc"
     xmlns:lp="http://namespaces.canonical.com/lp"
     i18n_domain="launchpad">
-    <include
-        package=".browser"/>
-
-    <publisher
-       name="bugs"
-       factory="lp.bugs.publisher.bugs_request_publication_factory"/>
+
+  <include package=".browser"/>
+
+  <publisher
+      name="bugs"
+      factory="lp.bugs.publisher.bugs_request_publication_factory"/>
+  <utility
+      component="lp.bugs.publisher.BugsLayer"
+      provides="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+      name="bugs" />
 
     <lp:help-folder
         folder="help" type="lp.bugs.publisher.BugsLayer" />

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-08-17 18:33:26 +0000
+++ lib/lp/code/configure.zcml	2010-08-20 05:52:56 +0000
@@ -14,8 +14,12 @@
   <authorizations module="lp.code.security" />
 
   <publisher
-     name="code"
-     factory="lp.code.publisher.code_request_publication_factory"/>
+      name="code"
+      factory="lp.code.publisher.code_request_publication_factory"/>
+  <utility
+      component="lp.code.publisher.CodeLayer"
+      provides="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+      name="code" />
 
   <!-- Branch Merge Queue -->
 

=== modified file 'lib/lp/code/publisher.py'
--- lib/lp/code/publisher.py	2010-07-20 23:52:46 +0000
+++ lib/lp/code/publisher.py	2010-08-20 05:52:56 +0000
@@ -13,11 +13,15 @@
 
 from zope.interface import implements
 from zope.publisher.interfaces.browser import (
-    IBrowserRequest, IDefaultBrowserLayer)
+    IBrowserRequest,
+    IDefaultBrowserLayer,
+    )
 
 from canonical.launchpad.webapp.publication import LaunchpadBrowserPublication
 from canonical.launchpad.webapp.servers import (
-    LaunchpadBrowserRequest, VHostWebServiceRequestPublicationFactory)
+    LaunchpadBrowserRequest,
+    VHostWebServiceRequestPublicationFactory,
+    )
 
 
 class CodeLayer(IBrowserRequest, IDefaultBrowserLayer):

=== modified file 'lib/lp/translations/browser/customlanguagecode.py'
--- lib/lp/translations/browser/customlanguagecode.py	2010-08-02 02:13:52 +0000
+++ lib/lp/translations/browser/customlanguagecode.py	2010-08-20 05:52:56 +0000
@@ -103,16 +103,18 @@
 
     @property
     def action_url(self):
-        return "%s/+add-custom-language-code" % canonical_url(self.context)
+        return canonical_url(
+            self.context, rootsite='translations',
+            view_name='+add-custom-language-code')
 
     @property
     def next_url(self):
         """See `LaunchpadFormView`."""
-        return "%s/+custom-language-codes" % canonical_url(self.context)
+        return canonical_url(
+            self.context, rootsite='translations',
+            view_name='+custom-language-codes')
 
-    @property
-    def cancel_url(self):
-        return self.next_url
+    cancel_url = next_url
 
 
 class CustomLanguageCodeView(LaunchpadView):
@@ -145,12 +147,12 @@
 
     @property
     def next_url(self):
-        return "%s/+custom-language-codes" % canonical_url(
-            self.context.translation_target)
+        """See `LaunchpadFormView`."""
+        return canonical_url(
+            self.context.translation_target, rootsite='translations',
+            view_name='+custom-language-codes')
 
-    @property
-    def cancel_url(self):
-        return self.next_url
+    cancel_url = next_url
 
 
 class HasCustomLanguageCodesTraversalMixin:

=== modified file 'lib/lp/translations/browser/distribution.py'
--- lib/lp/translations/browser/distribution.py	2010-02-16 21:21:14 +0000
+++ lib/lp/translations/browser/distribution.py	2010-08-20 05:52:56 +0000
@@ -38,16 +38,18 @@
     @enabled_with_permission('launchpad.TranslationsAdmin')
     def settings(self):
         text = 'Change permissions'
-        return Link('+settings', text, icon='edit')
+        return Link('+settings', text, icon='edit', site='translations')
 
     @enabled_with_permission('launchpad.TranslationsAdmin')
     def language_pack_admin(self):
         text = 'Language pack admin'
-        return Link('+select-language-pack-admin', text, icon='edit')
+        return Link(
+            '+select-language-pack-admin', text, icon='edit',
+            site='translations')
 
     def imports(self):
         text = 'Import queue'
-        return Link('+imports', text)
+        return Link('+imports', text, site='translations')
 
 
 class DistributionLanguagePackAdminView(LaunchpadEditFormView):
@@ -59,11 +61,9 @@
 
     @property
     def cancel_url(self):
-        return canonical_url(self.context)
+        return canonical_url(self.context, rootsite="translations")
 
-    @property
-    def next_url(self):
-        return canonical_url(self.context)
+    next_url = cancel_url
 
     @property
     def page_title(self):
@@ -119,11 +119,9 @@
 
     @property
     def cancel_url(self):
-        return canonical_url(self.context)
+        return canonical_url(self.context, rootsite="translations")
 
-    @property
-    def next_url(self):
-        return self.cancel_url
+    next_url = cancel_url
 
     @action('Change', name='change')
     def edit(self, action, data):

=== modified file 'lib/lp/translations/browser/distroseries.py'
--- lib/lp/translations/browser/distroseries.py	2010-08-02 02:23:26 +0000
+++ lib/lp/translations/browser/distroseries.py	2010-08-20 05:52:56 +0000
@@ -43,11 +43,9 @@
 
     @property
     def cancel_url(self):
-        return canonical_url(self.context)
+        return canonical_url(self.context, rootsite="translations")
 
-    @property
-    def next_url(self):
-        return canonical_url(self.context)
+    next_url = cancel_url
 
     @action("Change")
     def change_action(self, action, data):
@@ -174,14 +172,15 @@
         self._request_full_export()
         self.request.response.addInfoNotification(
             'Your changes have been applied.')
-        self.next_url = '%s/+language-packs' % canonical_url(self.context)
+        self.next_url = canonical_url(
+            self.context, rootsite='translations', view_name='+language-packs')
 
     @action("Request", condition=is_langpack_admin)
     def request_action(self, action, data):
         self.updateContextFromData(data)
         self._request_full_export()
-        self.next_url = '/'.join(
-            [canonical_url(self.context), '+language-packs'])
+        self.next_url = canonical_url(
+            self.context, rootsite='translations', view_name='+language-packs')
 
 
 class DistroSeriesTemplatesView(BaseSeriesTemplatesView):
@@ -261,31 +260,33 @@
         'latest_full_language_pack', 'latest_delta_language_pack', 'imports']
 
     def translations(self):
-        return Link('', 'Overview')
+        return Link('', 'Overview', site='translations')
 
     def imports(self):
-        return Link('+imports', 'Import queue')
+        return Link('+imports', 'Import queue', site='translations')
 
     @enabled_with_permission('launchpad.TranslationsAdmin')
     def admin(self):
-        return Link('+admin', 'Settings')
+        return Link('+admin', 'Settings', site='translations')
 
     @enabled_with_permission('launchpad.Edit')
     def templates(self):
-        return Link('+templates', 'Templates')
+        return Link('+templates', 'Templates', site='translations')
 
     def language_packs(self):
-        return Link('+language-packs', 'Language packs')
+        return Link('+language-packs', 'Language packs', site='translations')
 
     def latest_full_language_pack(self):
         return Link(
             '+latest-full-language-pack',
-            'Latest full language pack')
+            'Latest full language pack',
+            site='translations')
 
     def latest_delta_language_pack(self):
         return Link(
             '+latest-delta-language-pack',
-            'Latest delta language pack')
+            'Latest delta language pack',
+            site='translations')
 
 
 def check_distroseries_translations_viewable(distroseries):

=== modified file 'lib/lp/translations/browser/person.py'
--- lib/lp/translations/browser/person.py	2009-11-25 16:51:53 +0000
+++ lib/lp/translations/browser/person.py	2010-08-20 05:52:56 +0000
@@ -146,22 +146,24 @@
 
     def overview(self):
         text = 'Overview'
-        return Link('', text, icon='info')
+        return Link('', text, icon='info', site='translations')
 
     def imports(self):
         text = 'Import queue'
-        return Link('+imports', text, icon='info')
+        return Link('+imports', text, icon='info', site='translations')
 
     def licensing(self):
         text = 'Translations licensing'
         enabled = (self.person == self.user)
-        return Link('+licensing', text, enabled=enabled, icon='info')
+        return Link('+licensing', text, enabled=enabled, icon='info',
+                    site='translations')
 
     def translations_to_review(self):
         text = 'Translations to review'
         enabled = person_is_reviewer(self.person)
         return Link(
-            '+translations-to-review', text, enabled=enabled, icon='info')
+            '+translations-to-review', text, enabled=enabled, icon='info',
+            site='translations')
 
 
 class PersonTranslationView(LaunchpadView):
@@ -449,19 +451,20 @@
     @property
     def relicensing_url(self):
         """Return an URL for this view."""
-        return canonical_url(self.context, view_name='+licensing')
+        return canonical_url(self.context, view_name='+licensing',
+                             rootsite='translations')
 
     @property
     def cancel_url(self):
         """Escape to the person's main Translations page."""
-        return canonical_url(self.context)
+        return canonical_url(self.context, rootsite='translations')
 
     def getSafeRedirectURL(self, url):
         """Successful form submission should send to this URL."""
         if url and url.startswith(self.request.getApplicationURL()):
             return url
         else:
-            return canonical_url(self.context)
+            return canonical_url(self.context, rootsite='translations')
 
     @action(_("Confirm"), name="submit")
     def submit_action(self, action, data):

=== modified file 'lib/lp/translations/browser/poexportrequest.py'
--- lib/lp/translations/browser/poexportrequest.py	2010-02-23 23:26:15 +0000
+++ lib/lp/translations/browser/poexportrequest.py	2010-08-20 05:52:56 +0000
@@ -152,7 +152,8 @@
         self.request.response.addInfoNotification(_(
             "Your request has been received. Expect to receive an email "
             "shortly."))
-        self.request.response.redirect(canonical_url(self.context))
+        self.request.response.redirect(
+            canonical_url(self.context, rootsite='translations'))
 
     def formats(self):
         """Return a list of formats available for translation exports."""

=== modified file 'lib/lp/translations/browser/pofile.py'
--- lib/lp/translations/browser/pofile.py	2010-08-02 02:13:52 +0000
+++ lib/lp/translations/browser/pofile.py	2010-08-20 05:52:56 +0000
@@ -679,7 +679,8 @@
                 url = url + '?' + self.request['QUERY_STRING']
 
             return self.request.response.redirect(
-                canonical_url(self.user, view_name='+licensing') +
+                canonical_url(self.user, view_name='+licensing',
+                              rootsite='translations') +
                 '?' + urllib.urlencode({'back_to': url}))
 
         # The handling of errors is slightly tricky here. Because this

=== modified file 'lib/lp/translations/browser/product.py'
--- lib/lp/translations/browser/product.py	2010-07-30 06:08:54 +0000
+++ lib/lp/translations/browser/product.py	2010-08-20 05:52:56 +0000
@@ -36,12 +36,12 @@
 
     def imports(self):
         text = 'Import queue'
-        return Link('+imports', text)
+        return Link('+imports', text, site='translations')
 
     @enabled_with_permission('launchpad.TranslationsAdmin')
     def settings(self):
         text = 'Change permissions'
-        return Link('+settings', text, icon='edit')
+        return Link('+settings', text, icon='edit', site='translations')
 
     @enabled_with_permission('launchpad.AnyPerson')
     def translationdownload(self):
@@ -51,7 +51,8 @@
             preferred_series is not None)
         link = ''
         if enabled:
-            link = '%s/+export' % preferred_series.name
+            link = canonical_url(
+                preferred_series, rootsite='translations', view_name='+export')
             text = 'Download "%s"' % preferred_series.name
 
         return Link(link, text, icon='download', enabled=enabled)
@@ -73,11 +74,9 @@
 
     @property
     def cancel_url(self):
-        return canonical_url(self.context)
+        return canonical_url(self.context, rootsite="translations")
 
-    @property
-    def next_url(self):
-        return self.cancel_url
+    next_url = cancel_url
 
 
 class ProductView(LaunchpadView):

=== modified file 'lib/lp/translations/browser/productseries.py'
--- lib/lp/translations/browser/productseries.py	2010-07-24 14:52:29 +0000
+++ lib/lp/translations/browser/productseries.py	2010-08-20 05:52:56 +0000
@@ -61,35 +61,37 @@
 
     def overview(self):
         """Return a link to the overview page."""
-        return Link('', 'Overview')
+        return Link('', 'Overview', site='translations')
 
     @enabled_with_permission('launchpad.Edit')
     def templates(self):
         """Return a link to series PO templates."""
-        return Link('+templates', 'Templates')
+        return Link('+templates', 'Templates', site='translations')
 
     @enabled_with_permission('launchpad.Edit')
     def settings(self):
         """Return a link to configure the translations settings."""
-        return Link('+translations-settings', 'Settings')
+        return Link('+translations-settings', 'Settings', site='translations')
 
     @enabled_with_permission('launchpad.Edit')
     def requestbzrimport(self):
         """Return a link to request a bazaar import."""
-        return Link('+request-bzr-import', 'Request Bazaar import')
+        return Link(
+            '+request-bzr-import', 'Request Bazaar import',
+            site="translations")
 
     @enabled_with_permission('launchpad.Edit')
     def translationupload(self):
         """Return a link to upload translations."""
-        return Link('+translations-upload', 'Upload')
+        return Link('+translations-upload', 'Upload', site="translations")
 
     def translationdownload(self):
         """Return a link to download the translations."""
-        return Link('+export', 'Download')
+        return Link('+export', 'Download', site="translations")
 
     def imports(self):
         """Return a link to the import queue."""
-        return Link('+imports', 'Import queue')
+        return Link('+imports', 'Import queue', site="translations")
 
 
 class ProductSeriesTranslationsMenu(NavigationMenu,
@@ -120,7 +122,7 @@
 
     @property
     def cancel_url(self):
-        return canonical_url(self.context)
+        return canonical_url(self.context, rootsite='translations')
 
 
 class ProductSeriesTranslationsMixin(TranslationsMixin):
@@ -142,7 +144,8 @@
     def request_bzr_import_url(self):
         """URL to request a bazaar import."""
         return canonical_url(self.context,
-                             view_name="+request-bzr-import")
+                             view_name="+request-bzr-import",
+                             rootsite="translations")
 
     @property
     def link_branch_url(self):
@@ -153,7 +156,7 @@
     @property
     def translations_settings_url(self):
         """URL to change the translations for the series."""
-        return canonical_url(self.context,
+        return canonical_url(self.context, rootsite="translations",
                              view_name="+translations-settings")
 
 
@@ -170,7 +173,7 @@
 
     @property
     def cancel_url(self):
-        return canonical_url(self.context)
+        return canonical_url(self.context, rootsite='translations')
 
     def processForm(self):
         """Process a form if it was submitted."""
@@ -244,7 +247,7 @@
                     'administrator in the coming few days.  You can track '
                     'your upload\'s status in the '
                     '<a href="%s/+imports">Translation Import Queue</a>' %(
-                        canonical_url(self.context))))
+                        canonical_url(self.context, rootsite='translations'))))
 
         elif is_tar_filename(filename):
             # Add the whole tarball to the import queue.
@@ -271,7 +274,7 @@
                     'your upload\'s status in the '
                     '<a href="%s/+imports">Translation Import Queue</a>' %(
                         num, plural_s, plural_s, itthey,
-                        canonical_url(self.context))))
+                        canonical_url(self.context, rootsite='translations'))))
                 if len(conflicts) > 0:
                     if len(conflicts) == 1:
                         warning = (
@@ -427,7 +430,7 @@
     def __init__(self, context, request):
         super(ProductSeriesTranslationsSettingsView, self).__init__(
             context, request)
-        self.cancel_url = canonical_url(self.context)
+        self.cancel_url = canonical_url(self.context, rootsite='translations')
 
     @action(u"Save settings", name="save_settings")
     def change_settings_action(self, action, data):
@@ -456,12 +459,9 @@
 
     @property
     def next_url(self):
-        return canonical_url(self.context)
+        return canonical_url(self.context, rootsite='translations')
 
-    def __init__(self, context, request):
-        super(ProductSeriesTranslationsBzrImportView, self).__init__(
-            context, request)
-        self.cancel_url = canonical_url(self.context)
+    cancel_url = next_url
 
     def validate(self, action):
         """See `LaunchpadFormView`."""
@@ -500,12 +500,12 @@
     page_title = "Export to branch"
 
     @property
-    def cancel_url(self):
-        return canonical_url(self.context) + '/+translations-settings'
-
-    @property
     def next_url(self):
-        return canonical_url(self.context) + '/+translations-settings'
+        return canonical_url(
+            self.context, rootsite='translations',
+            view_name='+translations-settings')
+
+    cancel_url = next_url
 
     @action(_('Update'), name='update')
     def update_action(self, action, data):

=== modified file 'lib/lp/translations/browser/project.py'
--- lib/lp/translations/browser/project.py	2010-04-19 08:11:52 +0000
+++ lib/lp/translations/browser/project.py	2010-08-20 05:52:56 +0000
@@ -28,11 +28,11 @@
     @enabled_with_permission('launchpad.TranslationsAdmin')
     def settings(self):
         text = 'Change permissions'
-        return Link('+settings', text, icon='edit')
+        return Link('+settings', text, icon='edit', site='translations')
 
     def products(self):
         text = 'Products'
-        return Link('', text)
+        return Link('', text, site='translations')
 
     def overview(self):
         text = 'Overview'
@@ -59,11 +59,9 @@
 
     @property
     def cancel_url(self):
-        return canonical_url(self.context)
+        return canonical_url(self.context, rootsite="translations")
 
-    @property
-    def next_url(self):
-        return self.cancel_url
+    next_url = cancel_url
 
     @action('Change', name='change')
     def edit(self, action, data):

=== modified file 'lib/lp/translations/browser/sourcepackage.py'
--- lib/lp/translations/browser/sourcepackage.py	2009-09-17 15:27:58 +0000
+++ lib/lp/translations/browser/sourcepackage.py	2010-08-20 05:52:56 +0000
@@ -34,16 +34,17 @@
 
     def imports(self):
         text = 'Import queue'
-        return Link('+imports', text)
+        return Link('+imports', text, site='translations')
 
     @enabled_with_permission('launchpad.ExpensiveRequest')
     def download(self):
         text = 'Download'
         enabled = bool(self.context.getCurrentTranslationTemplates().any())
-        return Link('+export', text, icon='download', enabled=enabled)
+        return Link('+export', text, icon='download', enabled=enabled,
+                    site='translations')
 
     def overview(self):
-        return Link('', 'Overview', icon='info')
+        return Link('', 'Overview', icon='info', site='translations')
 
 
 class SourcePackageTranslationsExportView(BaseExportView):

=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml	2010-07-23 09:41:07 +0000
+++ lib/lp/translations/configure.zcml	2010-08-20 05:52:56 +0000
@@ -10,12 +10,16 @@
     xmlns:webservice="http://namespaces.canonical.com/webservice"
     xmlns:lp="http://namespaces.canonical.com/lp"
     i18n_domain="launchpad">
-    <include
-        package=".browser"/>
-
-    <publisher
-       name="translations"
-       factory="lp.translations.publisher.translations_request_publication_factory"/>
+
+  <include package=".browser"/>
+
+  <publisher
+      name="translations"
+      factory="lp.translations.publisher.translations_request_publication_factory"/>
+  <utility
+      component="lp.translations.publisher.TranslationsLayer"
+      provides="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+      name="translations" />
 
     <lp:help-folder
         folder="help" type="lp.translations.publisher.TranslationsLayer" />

=== modified file 'lib/lp/translations/templates/customlanguagecode-index.pt'
--- lib/lp/translations/templates/customlanguagecode-index.pt	2009-11-05 14:45:13 +0000
+++ lib/lp/translations/templates/customlanguagecode-index.pt	2010-08-20 05:52:56 +0000
@@ -28,13 +28,13 @@
       <ul class="horizontal">
         <li tal:condition="context/required:launchpad.Admin">
           <a class="remove sprite"
-             tal:attributes="href context/fmt:url/+remove">
+             tal:attributes="href context/fmt:url:translations/+remove">
             remove custom language code
           </a>
         </li>
         <li>
           <a class="info sprite"
-             tal:attributes="href context/translation_target/fmt:url/+custom-language-codes">
+             tal:attributes="href context/translation_target/fmt:url:translations/+custom-language-codes">
             custom language codes overview
           </a>
         </li>

=== modified file 'lib/lp/translations/templates/customlanguagecodes-index.pt'
--- lib/lp/translations/templates/customlanguagecodes-index.pt	2009-11-05 14:45:13 +0000
+++ lib/lp/translations/templates/customlanguagecodes-index.pt	2010-08-20 05:52:56 +0000
@@ -39,7 +39,7 @@
         <tbody>
           <tr tal:repeat="entry context/custom_language_codes">
             <td align="center">
-              <a tal:attributes="href entry/fmt:url"
+              <a tal:attributes="href entry/fmt:url:translations"
                  tal:content="entry/language_code">pt-PT</a>
             </td>
             <td>
@@ -52,7 +52,7 @@
               </tal:nolanguage>
             </td>
             <td tal:condition="context/required:launchpad.Admin">
-              <a tal:attributes="href entry/fmt:url/+remove"
+              <a tal:attributes="href entry/fmt:url:translations/+remove"
                  alt="Remove"
                  title="Remove"
                  class="remove sprite"></a>
@@ -69,7 +69,7 @@
     </p>
 
     <div>
-      <a tal:attributes="href context/fmt:url/+add-custom-language-code"
+      <a tal:attributes="href context/fmt:url:translations/+add-custom-language-code"
          tal:condition="context/required:launchpad.Admin"
          class="add sprite">
         Add a custom language code

=== modified file 'lib/lp/translations/templates/distribution-language-pack-admin-info.pt'
--- lib/lp/translations/templates/distribution-language-pack-admin-info.pt	2009-12-24 17:46:32 +0000
+++ lib/lp/translations/templates/distribution-language-pack-admin-info.pt	2010-08-20 05:52:56 +0000
@@ -13,8 +13,7 @@
     <tal:admin
        condition="context/required:launchpad.TranslationsAdmin">
       <a tal:attributes="
-           href
-           context/fmt:url/+select-language-pack-admin"
+           href context/fmt:url:translations/+select-language-pack-admin"
          class="edit sprite"></a>
     </tal:admin>
   </p>
@@ -23,7 +22,7 @@
     <p tal:condition="not:context/language_pack_admin">
       <a tal:attributes="
            href
-           context/fmt:url/+select-language-pack-admin"
+           context/fmt:url:translations/+select-language-pack-admin"
          class="edit sprite">Set language pack administrator</a>
     </p>
   </tal:admin>

=== modified file 'lib/lp/translations/templates/distribution-translations.pt'
--- lib/lp/translations/templates/distribution-translations.pt	2009-12-16 15:21:36 +0000
+++ lib/lp/translations/templates/distribution-translations.pt	2010-08-20 05:52:56 +0000
@@ -48,7 +48,7 @@
             <h3>Administration</h3>
             <p>To see all the translation files that are waiting to be
               imported, please look at
-              <a tal:attributes="href context/fmt:url/+imports"
+              <a tal:attributes="href context/fmt:url:translations/+imports"
                  tal:content="string:${context/displayname} import queue">
                 import queue</a>.
             </p>
@@ -78,7 +78,7 @@
 
     <ul id="distroseries-list">
       <li tal:repeat="distroseries view/secondary_translatable_series">
-        <a tal:attributes="href distroseries/fmt:url"
+        <a tal:attributes="href distroseries/fmt:url:translations"
           tal:content="distroseries/named_version">Hoary (5.04)</a>
       </li>
     </ul>

=== modified file 'lib/lp/translations/templates/distroseries-language-packs.pt'
--- lib/lp/translations/templates/distroseries-language-packs.pt	2010-04-21 22:28:02 +0000
+++ lib/lp/translations/templates/distroseries-language-packs.pt	2010-08-20 05:52:56 +0000
@@ -25,7 +25,7 @@
              Peter Langomat
            </tal:admin><a
                tal:condition="context/distribution/required:launchpad.Edit"
-               tal:attributes="href string:${context/distribution/fmt:url}/+select-language-pack-admin"
+               tal:attributes="href context/distribution/fmt:url:translations/+select-language-pack-admin"
                title="Change language pack administrator"><img
                class="edit sprite"/></a>.
          </p>

=== modified file 'lib/lp/translations/templates/distroseries-translations.pt'
--- lib/lp/translations/templates/distroseries-translations.pt	2010-04-21 20:52:57 +0000
+++ lib/lp/translations/templates/distroseries-translations.pt	2010-08-20 05:52:56 +0000
@@ -55,7 +55,7 @@
             <h3>Administration</h3>
             <p>Translation files that are waiting to be imported are shown in
               the
-              <a tal:attributes="href context/fmt:url/+imports"
+              <a tal:attributes="href context/fmt:url:translations/+imports"
                  tal:content="string:${context/displayname} import queue">
                 import queue</a>.
             </p>

=== modified file 'lib/lp/translations/templates/languageset-index.pt'
--- lib/lp/translations/templates/languageset-index.pt	2009-12-08 10:20:37 +0000
+++ lib/lp/translations/templates/languageset-index.pt	2010-08-20 05:52:56 +0000
@@ -41,7 +41,7 @@
         <dl id="preferred_languages"
             tal:condition="view/user">
           <dt>Your preferred languages:
-            <a tal:attributes="href string:${view/user/fmt:url}/+editlanguages"
+            <a tal:attributes="href view/user/fmt:url:translations/+editlanguages"
                class="edit sprite"></a>
           </dt>
           <dd tal:content="structure view/user_languages">

=== modified file 'lib/lp/translations/templates/product-portlet-translatables.pt'
--- lib/lp/translations/templates/product-portlet-translatables.pt	2009-11-17 10:17:34 +0000
+++ lib/lp/translations/templates/product-portlet-translatables.pt	2010-08-20 05:52:56 +0000
@@ -13,7 +13,7 @@
       <li class="translations"
           tal:repeat="series context/translatable_series">
         <a tal:content="series/title"
-               tal:attributes="href string:${series/fmt:url}/+translations">
+               tal:attributes="href series/fmt:url:translations/+translations">
           series title</a>
       </li>
     </ul>
@@ -30,13 +30,13 @@
         <li class="translations"
             tal:repeat="series view/untranslatable_series">
           <a tal:content="series/title"
-             tal:attributes="href string:${series/fmt:url}/+translations">
+             tal:attributes="href series/fmt:url:translations/+translations">
             series title</a> —
           <a tal:attributes="
-              href string:${series/fmt:url}/+translations-upload">
+              href series/fmt:url:translations/+translations-upload">
             manual</a> or
           <a tal:attributes="
-              href string:${series/fmt:url}/+translations-settings">
+              href series/fmt:url:translations/+translations-settings">
             automatic import</a>.
         </li>
       </ul>
@@ -68,7 +68,7 @@
      tal:condition="context/required:launchpad.Admin"
      id="custom-language-codes">
   If necessary, you may
-  <a tal:attributes="href context/fmt:url/+custom-language-codes"
+  <a tal:attributes="href context/fmt:url:translations/+custom-language-codes"
      class="edit sprite">
     define custom language codes
   </a>

=== modified file 'lib/lp/translations/templates/product-translations.pt'
--- lib/lp/translations/templates/product-translations.pt	2010-01-15 14:44:39 +0000
+++ lib/lp/translations/templates/product-translations.pt	2010-08-20 05:52:56 +0000
@@ -44,12 +44,12 @@
                               >trunk</tal:target>.
                   <span tal:condition="context/required:launchpad.AnyPerson">
                     You can also
-                    <a tal:attributes="href target/fmt:url/+export"
+                    <a tal:attributes="href target/fmt:url:translations/+export"
                        >download</a>
                     <tal:owner-or-admin condition="admin_user">
                       or
                       <a tal:attributes="
-                          href target/fmt:url/+translations-upload"
+                          href target/fmt:url:translations/+translations-upload"
                        >upload</a>
                     </tal:owner-or-admin>
                     translations for
@@ -59,7 +59,7 @@
                 </p>
                 <p>To see all the translation files that are waiting to be
                   imported, please look at
-                  <a tal:attributes="href context/fmt:url/+imports"
+                  <a tal:attributes="href context/fmt:url:translations/+imports"
                      tal:content="string:${context/displayname} import queue">
                     import queue</a>.
                 </p>

=== modified file 'lib/lp/translations/templates/productseries-translations-upload.pt'
--- lib/lp/translations/templates/productseries-translations-upload.pt	2010-01-12 13:48:24 +0000
+++ lib/lp/translations/templates/productseries-translations-upload.pt	2010-08-20 05:52:56 +0000
@@ -24,7 +24,7 @@
 
   <p>
     <strong>Note:</strong> it's quicker and easier to <a tal:attributes="
-    href string:${context/fmt:url}/+translations-settings">import from a
+    href context/fmt:url:translations/+translations-settings">import from a
     Bazaar branch</a> instead (<a href="/+help/importing-from-bzr.html"
     target="help">More about importing from Bazaar</a>)
   </p>

=== modified file 'lib/lp/translations/templates/rosetta-index.pt'
--- lib/lp/translations/templates/rosetta-index.pt	2009-11-07 07:46:54 +0000
+++ lib/lp/translations/templates/rosetta-index.pt	2010-08-20 05:52:56 +0000
@@ -55,7 +55,7 @@
              tal:attributes="style string:font-size:${product/font_size}%;">
             <a
               tal:attributes="
-                href string:${product/pillar/fmt:url}/+translations"
+                href product/pillar/fmt:url:translations/+translations"
               tal:content="product/pillar/displayname" />
           </span>
           <div>

=== modified file 'lib/lp/translations/templates/sourcepackage-translations.pt'
--- lib/lp/translations/templates/sourcepackage-translations.pt	2009-11-17 10:17:34 +0000
+++ lib/lp/translations/templates/sourcepackage-translations.pt	2010-08-20 05:52:56 +0000
@@ -42,7 +42,7 @@
             <p tal:condition="context/required:launchpad.Admin"
                id="custom-language-codes">
               If necessary, you may
-              <a tal:attributes="href context/distribution_sourcepackage/fmt:url/+custom-language-codes"
+              <a tal:attributes="href context/distribution_sourcepackage/fmt:url:translations/+custom-language-codes"
                  class="edit sprite">
                 define custom language codes
               </a>

=== modified file 'lib/lp/translations/tests/test_pofile.py'
--- lib/lp/translations/tests/test_pofile.py	2010-08-06 06:51:37 +0000
+++ lib/lp/translations/tests/test_pofile.py	2010-08-20 05:52:56 +0000
@@ -34,7 +34,7 @@
         # Create a product with two series and a shared POTemplate
         # in different series ('devel' and 'stable').
         super(TestTranslationSharedPOFile, self).setUp()
-        self.foo = self.factory.makeProduct()
+        self.foo = self.factory.makeProduct(name='foo')
         self.foo_devel = self.factory.makeProductSeries(
             name='devel', product=self.foo)
         self.foo_stable = self.factory.makeProductSeries(
@@ -58,6 +58,15 @@
         self.potmsgset = self.factory.makePOTMsgSet(self.devel_potemplate)
         self.potmsgset.setSequence(self.devel_potemplate, 1)
 
+    def test_POFile_canonical_url(self):
+        # Test the canonical_url of the POFile.
+        self.assertEqual(
+            'http://translations.launchpad.dev/foo/devel/+pots/messages/sr',
+            canonical_url(self.devel_sr_pofile))
+        self.assertEqual(
+            'http://translations.launchpad.dev/foo/devel/+pots/messages/sr/+details',
+            canonical_url(self.devel_sr_pofile, view_name="+details"))
+
     def test_findPOTMsgSetsContaining(self):
         # Test that search works correctly.
 

=== modified file 'lib/lp/vostok/configure.zcml'
--- lib/lp/vostok/configure.zcml	2010-08-06 18:13:00 +0000
+++ lib/lp/vostok/configure.zcml	2010-08-20 05:52:56 +0000
@@ -8,10 +8,14 @@
   <include package=".browser" />
 
   <publisher
-     name="vostok"
-     factory="lp.vostok.publisher.vostok_request_publication_factory"
-     methods="*"
-     mimetypes="*" />
+      name="vostok"
+      factory="lp.vostok.publisher.vostok_request_publication_factory"
+      methods="*"
+      mimetypes="*" />
+  <utility
+      component="lp.vostok.publisher.VostokLayer"
+      provides="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+      name="vostok" />
 
   <securedutility
      class="lp.vostok.publisher.VostokRoot"