diff --git a/README.txt b/README.txt index b6da1e7..2ee1439 100755 --- a/README.txt +++ b/README.txt @@ -336,9 +336,6 @@ or resources they are related to. The view manager has already been created during setup. >>> from loops.view import ViewManager, Node - >>> from zope.security.checker import NamesChecker, defineChecker - >>> nodeChecker = NamesChecker(('body', 'title',)) - >>> defineChecker(Node, nodeChecker) The view space is typically built up with nodes; a node may be a top-level menu that may contain other nodes as menu or content items: diff --git a/browser/form.py b/browser/form.py index b061bfa..cae6b05 100644 --- a/browser/form.py +++ b/browser/form.py @@ -29,7 +29,7 @@ from zope.interface import Interface from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent from zope.app.container.interfaces import INameChooser -from zope.app.container.contained import NameChooser +#from zope.app.container.contained import NameChooser from zope.app.pagetemplate import ViewPageTemplateFile from zope.cachedescriptors.property import Lazy from zope.contenttype import guess_content_type @@ -246,7 +246,7 @@ class CreateObjectForm(ObjectForm): def adapted(self): ad = self.typeInterface(Resource()) ad.storageName = 'unknown' # hack for file objects: don't try to retrieve data - return (ad) + return ad @Lazy def instance(self): diff --git a/browser/node.py b/browser/node.py index 49c4bae..021d0d5 100644 --- a/browser/node.py +++ b/browser/node.py @@ -106,8 +106,6 @@ class NodeView(BaseView): priority=10) # force early portlet registrations by target by setting up target view self.virtualTarget - # force early portlet registrations by target by setting up target view - self.virtualTarget @Lazy def view(self): diff --git a/helpers.txt b/helpers.txt index 29d11f9..76efbe2 100755 --- a/helpers.txt +++ b/helpers.txt @@ -379,10 +379,6 @@ is used to retrieve a macro used by NodeView. As the display of the standard macros is controlled by permissions we have to install a checker first. - >>> from zope.security.checker import NamesChecker, defineChecker - >>> nodeChecker = NamesChecker(('body', 'title',)) - >>> defineChecker(Node, nodeChecker) - >>> from cybertools.browser.controller import Controller >>> from loops.browser.util import node_macros >>> from loops.browser.common import BaseView diff --git a/tests/setup.py b/tests/setup.py index 96e508d..f0eb57c 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -62,7 +62,7 @@ from loops.security.policy import LoopsSecurityPolicy from loops.security.setter import BaseSecuritySetter from loops.setup import SetupManager, addObject from loops.type import LoopsType, ConceptType, ResourceType, TypeConcept -from loops.view import NodeAdapter +from loops.view import Node, NodeAdapter class ClientIdManager(object): @@ -82,11 +82,12 @@ class TestSite(object): #oldPolicy = setSecurityPolicy(ZopeSecurityPolicy) oldPolicy = setSecurityPolicy(LoopsSecurityPolicy) - checker = Checker(dict(title='zope.View', data='zope.View'), + checker = Checker(dict(title='zope.View', data='zope.View', body='zope.View'), dict(title='zope.ManageContent')) defineChecker(Concept, checker) defineChecker(Resource, checker) defineChecker(Document, checker) + defineChecker(Node, checker) component.provideUtility(IntIdsStub()) relations = RelationRegistry()