Commit 4c2e25b0 authored by 's avatar

Merged fixes for 1594/1595 from 2.2 branch

parent 35168295
...@@ -114,6 +114,8 @@ class FactoryDispatcher(Acquisition.Implicit): ...@@ -114,6 +114,8 @@ class FactoryDispatcher(Acquisition.Implicit):
"""Provide a namespace for product "methods" """Provide a namespace for product "methods"
""" """
_owner=UnownableOwner
def __init__(self, product, dest, REQUEST=None): def __init__(self, product, dest, REQUEST=None):
if hasattr(product,'aq_base'): product=product.aq_base if hasattr(product,'aq_base'): product=product.aq_base
self._product=product self._product=product
...@@ -135,7 +137,11 @@ class FactoryDispatcher(Acquisition.Implicit): ...@@ -135,7 +137,11 @@ class FactoryDispatcher(Acquisition.Implicit):
def DestinationURL(self): def DestinationURL(self):
"Return the URL for the destination for factory output" "Return the URL for the destination for factory output"
return self._u url=getattr(self, '_u', None)
if url is None:
url=self.Destination().absolute_url()
return url
DestinationURL__roles__=None DestinationURL__roles__=None
def __getattr__(self, name): def __getattr__(self, name):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment