[Zope3-checkins] CVS: Zope3/src/zope/app/browser/utilities - configure.zcml:1.1.2.4 content.py:1.1.2.3 schema.py:1.1.2.2

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/app/browser/utilities
In directory cvs.zope.org:/tmp/cvs-serv9687/browser/utilities

Modified Files:
      Tag: dreamcatcher-ttwschema-branch
	configure.zcml content.py schema.py 
Log Message:
Fixed infinite recursion bug that occurred for IAdding menus.

All of the new components and features seem to work now. It's time to write
the last tests, so we can merge the branch into the head.


=== Zope3/src/zope/app/browser/utilities/configure.zcml 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/browser/utilities/configure.zcml:1.1.2.3	Fri Aug 15 13:39:17 2003
+++ Zope3/src/zope/app/browser/utilities/configure.zcml	Fri Aug 15 16:24:50 2003
@@ -39,7 +39,7 @@
       for="zope.app.interfaces.container.IAdding"
       menu="add_component"
       action="zope.app.utilities.schema.SchemaUtility"
-      title="Persistent Schema Utility"
+      title="Mutable Schema"
       description="A Persistent Schema that can be edited through the web"
       permission="zope.ManageServices"
       />
@@ -49,7 +49,7 @@
       for="zope.app.interfaces.container.IAdding"
       menu="add_utility"
       action="zope.app.utilities.schema.SchemaUtility"
-      title="Persistent Schema Utility"
+      title="Mutable Schema"
       description="A Persistent Schema that can be edited through the web"
       permission="zope.ManageServices"
       />


=== Zope3/src/zope/app/browser/utilities/content.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/browser/utilities/content.py:1.1.2.2	Fri Aug 15 13:11:33 2003
+++ Zope3/src/zope/app/browser/utilities/content.py	Fri Aug 15 16:24:50 2003
@@ -15,19 +15,21 @@
 
 $Id$
 """
-from zope.interface import implements
-
 from zope.app import zapi
 from zope.app.browser.form.add import AddView
 from zope.app.browser.form.editview import EditView
 from zope.app.browser.form.submit import Update
 from zope.app.form.utility import setUpWidget
+from zope.app.interfaces.utilities.content import IContentComponentDefinition
 from zope.app.security.permission import PermissionField
 from zope.app.services.servicenames import Utilities
-from zope.app.interfaces.utilities.content import IContentComponentDefinition
+from zope.app.utilities.content import ContentComponentInstance
 from zope.component.exceptions import ComponentLookupError
+from zope.interface import implements
 from zope.publisher.interfaces import IPublishTraverse
-
+from zope.schema import getFieldNamesInOrder, getFieldsInOrder
+from zope.security.checker import CheckerPublic
+from zope.security.proxy import trustedRemoveSecurityProxy
 
 class ContentComponentPermissionEdit(EditView):
 
@@ -114,7 +116,8 @@
         self.definition = matching[0][2].active().getComponent()
         self.schema = self.definition.schema
         self.label = 'Add %s' %self.definition.name
-        super(AddContentComponentView, self).__init__(self.context, request)
+        super(AddContentComponentInstanceView, self).__init__(self.context,
+                                                              request)
 
         return self.generated_form
 
@@ -144,6 +147,7 @@
     def __init__(self, context, request):
         self.schema = context.getSchema()
         self.label = 'Edit %s' %context.__name__
-        super(EditContentComponentInstanceView, self).__init__(context, request)
+        super(EditContentComponentInstanceView, self).__init__(context,
+                                                               request)
 
 


=== Zope3/src/zope/app/browser/utilities/schema.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/utilities/schema.py:1.1.2.1	Fri Aug 15 10:04:41 2003
+++ Zope3/src/zope/app/browser/utilities/schema.py	Fri Aug 15 16:24:50 2003
@@ -15,13 +15,16 @@
 
 $Id$
 """
+from zope.app import zapi
 from zope.app.browser.form.editview import EditView
 from zope.app.form.utility import setUpEditWidgets
+from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.interfaces.utilities.schema import IMutableSchema
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.security.permission import PermissionField
 from zope.app.utilities.schema import SchemaAdding
 from zope.publisher.browser import BrowserView
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.schema import getFieldNamesInOrder, getFieldsInOrder
 
 class EditSchema(BrowserView):