[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/ - moved security declarations to zcml (using the class directive because Zope 2's adapter directive doesn't support 'permission')

[Yvo Schubbe]

Log message for revision 94321:
  - moved security declarations to zcml (using the class directive because Zope 2's adapter directive doesn't support 'permission')

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/configure.zcml
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/favorite.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/file.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/link.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/configure.zcml	2008-12-25 11:03:41 UTC (rev 94320)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/configure.zcml	2008-12-25 11:22:30 UTC (rev 94321)
@@ -22,6 +22,13 @@
 
   <adapter factory=".folder.FallbackAddView" />
 
+  <class class=".folder.FallbackAddView">
+    <require
+        permission="cmf.AddPortalContent"
+        interface="zope.formlib.interfaces.IPageForm"
+        />
+  </class>
+
   <adapter factory=".metadata.MinimalMetadataSchemaAdapter"/>
 
   <browser:page
@@ -83,6 +90,13 @@
       factory=".link.LinkAddView"
       />
 
+  <class class=".link.LinkAddView">
+    <require
+        permission="cmf.AddPortalContent"
+        interface="zope.formlib.interfaces.IPageForm"
+        />
+  </class>
+
   <browser:page
       for="..interfaces.ILink"
       layer="..interfaces.ICMFDefaultSkin"
@@ -107,6 +121,13 @@
       factory=".favorite.FavoriteAddView"
       />
 
+  <class class=".favorite.FavoriteAddView">
+    <require
+        permission="cmf.AddPortalContent"
+        interface="zope.formlib.interfaces.IPageForm"
+        />
+  </class>
+
   <browser:page
       for="..interfaces.IMutableFavorite"
       layer="..interfaces.ICMFDefaultSkin"
@@ -122,6 +143,13 @@
       factory=".file.FileAddView"
       />
 
+  <class class=".file.FileAddView">
+    <require
+        permission="cmf.AddPortalContent"
+        interface="zope.formlib.interfaces.IPageForm"
+        />
+  </class>
+
   <adapter
       name="cmf.image"
       factory=".file.FileAddView"

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/favorite.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/favorite.py	2008-12-25 11:03:41 UTC (rev 94320)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/favorite.py	2008-12-25 11:22:30 UTC (rev 94321)
@@ -17,8 +17,6 @@
 
 import urlparse
 
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
 from zope.app.form.browser import BytesWidget
 from zope.component import adapts
 from zope.formlib import form
@@ -36,7 +34,6 @@
 from Products.CMFDefault.formlib.schema import SchemaAdapterBase
 from Products.CMFDefault.formlib.widgets import IDInputWidget
 from Products.CMFDefault.interfaces import IMutableFavorite
-from Products.CMFDefault.permissions import AddPortalContent
 from Products.CMFDefault.utils import Message as _
 
 
@@ -119,9 +116,6 @@
     """Add view for IMutableFavorite.
     """
 
-    security = ClassSecurityInfo()
-    security.declareObjectProtected(AddPortalContent)
-
     form_fields = (
         form.FormFields(ASCIILine(__name__='id', title=_(u'ID'))) +
         form.FormFields(IFavoriteSchema).omit('language')
@@ -143,9 +137,7 @@
         adapted.remote_url = data['remote_url']
         return obj
 
-InitializeClass(FavoriteAddView)
 
-
 class FavoriteEditView(ContentEditFormBase):
 
     """Edit view for IMutableFavorite.

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/file.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/file.py	2008-12-25 11:03:41 UTC (rev 94320)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/file.py	2008-12-25 11:22:30 UTC (rev 94321)
@@ -15,8 +15,6 @@
 $Id$
 """
 
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
 from zope.component import adapts
 from zope.formlib import form
 from zope.interface import implements
@@ -31,7 +29,6 @@
 from Products.CMFDefault.formlib.schema import ProxyFieldProperty
 from Products.CMFDefault.formlib.schema import SchemaAdapterBase
 from Products.CMFDefault.interfaces import IMutableFile
-from Products.CMFDefault.permissions import AddPortalContent
 from Products.CMFDefault.utils import Message as _
 
 
@@ -93,9 +90,6 @@
     """Add view for IMutableFile.
     """
 
-    security = ClassSecurityInfo()
-    security.declareObjectProtected(AddPortalContent)
-
     form_fields = (
         form.FormFields(IFileSchema).select('title', 'description') +
         form.FormFields(FileUpload(__name__='file', title=_(u'Upload')))
@@ -117,9 +111,7 @@
         adapted.file = data['file']
         return obj
 
-InitializeClass(FileAddView)
 
-
 class FileEditView(ContentEditFormBase):
 
     """Edit view for IMutableFile.

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2008-12-25 11:03:41 UTC (rev 94320)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/folder.py	2008-12-25 11:22:30 UTC (rev 94321)
@@ -15,9 +15,7 @@
 $Id$
 """
 
-from AccessControl import ClassSecurityInfo
 from DocumentTemplate import sequence
-from Globals import InitializeClass
 from Products.PythonScripts.standard import thousands_commas
 from zope.formlib import form
 from zope.schema import ASCIILine
@@ -49,9 +47,6 @@
     """Add view for IDynamicType content.
     """
 
-    security = ClassSecurityInfo()
-    security.declareObjectProtected(AddPortalContent)
-
     form_fields = form.FormFields(ASCIILine(__name__='id', title=_(u'ID')))
     form_fields['id'].custom_widget = IDInputWidget
 
@@ -70,9 +65,7 @@
         self._added_obj = obj
         return obj
 
-InitializeClass(FallbackAddView)
 
-
 # XXX: This should be refactored using formlib. Please don't import from this
 #      module, things might be changed without further notice.
 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/link.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/link.py	2008-12-25 11:03:41 UTC (rev 94320)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/link.py	2008-12-25 11:22:30 UTC (rev 94321)
@@ -17,8 +17,6 @@
 
 import urlparse
 
-from AccessControl import ClassSecurityInfo
-from Globals import InitializeClass
 from zope.app.form.browser import BytesWidget
 from zope.component import adapts
 from zope.formlib import form
@@ -35,7 +33,6 @@
 from Products.CMFDefault.formlib.schema import SchemaAdapterBase
 from Products.CMFDefault.formlib.widgets import IDInputWidget
 from Products.CMFDefault.interfaces import IMutableLink
-from Products.CMFDefault.permissions import AddPortalContent
 from Products.CMFDefault.utils import Message as _
 
 from utils import decode
@@ -124,9 +121,6 @@
     """Add view for IMutableLink.
     """
 
-    security = ClassSecurityInfo()
-    security.declareObjectProtected(AddPortalContent)
-
     form_fields = (
         form.FormFields(ASCIILine(__name__='id', title=_(u'ID'))) +
         form.FormFields(ILinkSchema).omit('language')
@@ -147,9 +141,7 @@
         adapted.remote_url = data['remote_url']
         return obj
 
-InitializeClass(LinkAddView)
 
-
 class LinkEditView(ContentEditFormBase):
 
     """Edit view for IMutableLink.