[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser - FolderContents.py:1.1.4.4 LoadedFolderContents.py:1.1.4.3 add.pt:1.1.4.2 browser.zcml:1.1.4.3 contents.pt:1.1.4.2 limit.pt:1.1.4.2 loaded_folder_contents.pt:1.1.4.2
Jim Fulton
jim@zope.com
Fri, 7 Jun 2002 10:41:40 -0400
Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser
In directory cvs.zope.org:/tmp/cvs-serv12187/lib/python/Zope/App/OFS/Content/Folder/Views/Browser
Modified Files:
Tag: Zope-3x-branch
FolderContents.py LoadedFolderContents.py add.pt browser.zcml
contents.pt limit.pt loaded_folder_contents.pt
Log Message:
Merging in Zope3InWonderland-branch, which implemented the following
proposals (see
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/OldProposals):
- RenameAllowToRequire
- GroupClassRelatedDirectivesInClassDirective
- ViewInterfaceAndSimplification
- ConsistentUseOfSpacesAsDelimitersInZCMLAttributes
- TwoArgumentViewConstructors
- ImplementsInZCML
- SimpleViewCreationInZCML
- RemoveGetView
- ReplaceProtectWithAllow
- ViewMethodsAsViews
- MergeProtectionAndComponentDefinitions
There were also various security fixes resulting of better integration
of security with components.
=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/FolderContents.py 1.1.4.3 => 1.1.4.4 ===
sm = ServiceManager()
- if self.getContext().hasServiceManager():
+ if self.context.hasServiceManager():
raise 'HasServiceManager', (
'This folder already contains a service manager')
- self.getContext().setServiceManager(sm)
+ self.context.setServiceManager(sm)
if REQUEST is not None:
return self.index(REQUEST)
=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/LoadedFolderContents.py 1.1.4.2 => 1.1.4.3 ===
def moveObjectsUp(self, ids, REQUEST = None):
'''See interface IOrderedContainer'''
- self.getContext().moveObjectsUp(ids)
+ self.context.moveObjectsUp(ids)
if REQUEST is not None:
# for unit tests
@@ -39,7 +39,7 @@
def moveObjectsDown(self, ids, REQUEST = None):
'''See interface IOrderedContainer'''
- self.getContext().moveObjectsDown(ids)
+ self.context.moveObjectsDown(ids)
if REQUEST is not None:
# for unit tests
@@ -48,7 +48,7 @@
def moveObjectsToTop(self, ids, REQUEST = None):
'''See interface IOrderedContainer'''
- self.getContext().moveObjectsToTop(ids)
+ self.context.moveObjectsToTop(ids)
if REQUEST is not None:
# for unit tests
@@ -57,7 +57,7 @@
def moveObjectsToBottom(self, ids, REQUEST = None):
'''See interface IOrderedContainer'''
- self.getContext().moveObjectsToBottom(ids)
+ self.context.moveObjectsToBottom(ids)
if REQUEST is not None:
# for unit tests
=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/add.pt 1.1.4.1 => 1.1.4.2 ===
<div metal:fill-slot="body">
-<form action="action.html" method="POST">
+<form action="add.html" method="POST">
<table class="TypeListing">
<caption>Add Content To Folder</caption>
=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/browser.zcml 1.1.4.2 => 1.1.4.3 ===
<!-- Folder View Directives -->
-
- <browser:defaultView name="contents"
- for="Zope.App.OFS.Content.Folder.Folder.IFolder."
- factory=".FolderContents." />
-
- <security:protectClass
- class=".FolderContents."
- permission_id="Zope.ManageContent"
- names="index, addServiceManager"/>
- <browser:view name="adder"
- for="Zope.App.OFS.Content.Folder.Folder.IFolder."
- factory=".FolderAdder." />
-
- <security:protectClass
- class=".FolderAdder."
- permission_id="Zope.ManageContent"
- names="index" />
+ <browser:defaultView
+ for="Zope.App.OFS.Content.Folder.Folder.IFolder."
+ name="index.html" />
+
+ <browser:view
+ for="Zope.App.OFS.Content.Folder.Folder.IFolder."
+ permission="Zope.ManageContent"
+ factory=".FolderContents.">
+
+ <browser:page name="index.html"
+ attribute="index"
+ />
+ <browser:page name="addServiceManager.html"
+ attribute="addServiceManager"
+ />
+ </browser:view>
+
+ <browser:view
+ for="Zope.App.OFS.Content.Folder.Folder.IFolder."
+ permission="Zope.ManageContent"
+ factory=".FolderAdder." >
+
+ <browser:page name="addForm.html"
+ attribute="index"
+ />
+ <browser:page name="add.html"
+ attribute="action"
+ />
+ </browser:view>
<!-- Loaded Folder View Directives -->
-
- <browser:defaultView name="contents"
- for="Zope.App.OFS.Content.Folder.LoadedFolder.ILoadedFolder."
- factory=".LoadedFolderContents." />
-
- <security:protectClass
- class=".LoadedFolderContents."
- permission_id="Zope.View"
- names="index, moveObjectsUp, moveObjectsDown, moveObjectsToTop,
- moveObjectsToBottom" />
-
- <browser:view name="limit"
- for="Zope.App.OFS.Container.IContainerLimit."
- factory=".FolderLimitEdit." />
-
- <security:protectClass
- class=".FolderLimitEdit."
- permission_id="Zope.ManageContent"
- names="index, action, getFieldViews" />
+
+ <browser:defaultView
+ for="Zope.App.OFS.Content.Folder.LoadedFolder.ILoadedFolder."
+ name="index.html" />
+
+ <browser:view
+ for="Zope.App.OFS.Content.Folder.LoadedFolder.ILoadedFolder."
+ permission="Zope.View"
+ factory=".LoadedFolderContents.">
+
+ <browser:page name="index.html"
+ attribute="index"
+ />
+ </browser:view>
+
+ <browser:view
+ for="Zope.App.OFS.Container.IContainerLimit."
+ permission="Zope.ManageContent"
+ factory=".FolderLimitEdit.">
+
+ <browser:page name="FolderLimitEditForm.html"
+ attribute="index"
+ />
+ <browser:page name="SetFolderLimit.html"
+ attribute="action"
+ />
+ </browser:view>
<browser:view name="LimitFieldView"
- for="Zope.App.OFS.Container.IContainerLimit."
- factory="Zope.App.OFS.Content.Folder.LoadedFolderFields.LimitField.
- Zope.App.Formulator.Widgets.Browser.TextWidget." />
-
- <browser:view name="adder"
- for="Zope.App.OFS.Content.Folder.LoadedFolder.ILoadedFolder."
- factory=".FolderAdder." />
-
- <security:protectClass
- class=".FolderAdder."
- permission_id="Zope.ManageContent"
- names="index, confirmed, action, listAddableInfo" />
+ for="Zope.App.OFS.Container.IContainerLimit."
+ factory="Zope.App.OFS.Content.Folder.LoadedFolderFields.LimitField.
+ Zope.App.Formulator.Widgets.Browser.TextWidget." />
</zopeConfigure>
=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/contents.pt 1.1.4.1 => 1.1.4.2 ===
<div metal:fill-slot="body">
-<form action="" method="get">
+<form action="./view::index.html" method="get">
<table class="ContentListing">
- <caption>Folder Contents <a href="../adder;view"> Add... </a> </caption>
+ <caption>Folder Contents
+ <a href="./view::addForm.html"> Add... </a> </caption>
<tbody>
@@ -81,8 +82,10 @@
i18n:attributes="value string:menu_delete_button">
</form>
-<p><a href="../Services;etc/" tal:condition="context/hasServiceManager">Services</a>
-<a href="addServiceManager" tal:condition="not: context/hasServiceManager">Allow Services</a>
+<p><a href="./etc::Services/"
+ tal:condition="context/hasServiceManager">Services</a>
+<a href="./view::addServiceManager.html"
+ tal:condition="not: context/hasServiceManager">Allow Services</a>
</p>
</div>
</body>
=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/limit.pt 1.1.4.1 => 1.1.4.2 ===
</div>
- <form action="action" method="post">
+ <form action="SetFolderLimit.html" method="post">
<table class="EditTable">
<tbody>
=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Views/Browser/loaded_folder_contents.pt 1.1.4.1 => 1.1.4.2 ===
<div metal:fill-slot="body">
-<form action="../contents;view" method="post">
+<form action="./view::index.html" method="post">
<table class="ContentListing">
- <caption>Folder Contents <a href="../adder;view"> Add... </a> </caption>
+ <caption>Folder Contents
+ <a href="./view::addForm.html"> Add... </a> </caption>
<tbody>