Commit 35168295 authored by Shane Hathaway's avatar Shane Hathaway

Merge changes from 2_2 branch

parent f8fffc40
...@@ -88,10 +88,10 @@ ...@@ -88,10 +88,10 @@
import Acquisition, sys, Products import Acquisition, sys, Products
from string import rfind from string import rfind
from AccessControl.PermissionMapping import aqwrap from AccessControl.PermissionMapping import aqwrap
from AccessControl.Owned import UnownableOwner
class ProductDispatcher(Acquisition.Implicit): class ProductDispatcher(Acquisition.Implicit):
" " " "
# Allow access to factory dispatchers # Allow access to factory dispatchers
__allow_access_to_unprotected_subobjects__=1 __allow_access_to_unprotected_subobjects__=1
...@@ -106,12 +106,12 @@ class ProductDispatcher(Acquisition.Implicit): ...@@ -106,12 +106,12 @@ class ProductDispatcher(Acquisition.Implicit):
getattr(Products, name, None), getattr(Products, name, None),
'__FactoryDispatcher__', '__FactoryDispatcher__',
FactoryDispatcher) FactoryDispatcher)
dispatcher=dispatcher_class(product, self.aq_parent, REQUEST) dispatcher=dispatcher_class(product, self.aq_parent, REQUEST)
return dispatcher.__of__(self) return dispatcher.__of__(self)
class FactoryDispatcher(Acquisition.Implicit): class FactoryDispatcher(Acquisition.Implicit):
"""Provide a namspace for product "methods" """Provide a namespace for product "methods"
""" """
def __init__(self, product, dest, REQUEST=None): def __init__(self, product, dest, REQUEST=None):
...@@ -159,6 +159,9 @@ class FactoryDispatcher(Acquisition.Implicit): ...@@ -159,6 +159,9 @@ class FactoryDispatcher(Acquisition.Implicit):
# Provide acquired indicators for critical OM methods: # Provide acquired indicators for critical OM methods:
_setObject=_getOb=Acquisition.Acquired _setObject=_getOb=Acquisition.Acquired
# Make sure factory methods are unowned:
_owner=UnownableOwner
# Provide a replacement for manage_main that does a redirection: # Provide a replacement for manage_main that does a redirection:
def manage_main(trueself, self, REQUEST, update_menu=0): def manage_main(trueself, self, REQUEST, update_menu=0):
"""Implement a contents view by redirecting to the true view """Implement a contents view by redirecting to the true view
......
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