[Zope-CVS] CVS: Products/PageDesign - PageDesign.py:1.15 SlotNameCollector.py:1.3

[Casey Duncan]

Update of /cvs-repository/Products/PageDesign
In directory cvs.zope.org:/tmp/cvs-serv23922

Modified Files:
	PageDesign.py SlotNameCollector.py 
Log Message:
Fix getSlotNames method: Add missing import and template argument. Add security assertions and class initialization to SlotNameCollector classes


=== Products/PageDesign/PageDesign.py 1.14 => 1.15 ===
--- Products/PageDesign/PageDesign.py:1.14	Thu Sep 18 14:13:21 2003
+++ Products/PageDesign/PageDesign.py	Tue Oct 28 18:04:03 2003
@@ -37,6 +37,7 @@
 
 from RawFile import RawFile
 from SlotProvider import SlotProvider
+from SlotNameCollector import SlotNameCollector
 from ElementReference import ElementReference
 from interfaces import ISlotProvider, IClipboardSource, IClipboardTarget
 
@@ -257,7 +258,7 @@
         template = self.getTemplate()
         if template is not None:
             slots = SlotNameCollector().__of__(self)
-            template(slots=slots)
+            template(design=self, slots=slots)
             names = slots._getNames()
         for k in self._slots.keys():
             names[k] = 1


=== Products/PageDesign/SlotNameCollector.py 1.2 => 1.3 ===
--- Products/PageDesign/SlotNameCollector.py:1.2	Thu Sep 18 14:13:21 2003
+++ Products/PageDesign/SlotNameCollector.py	Tue Oct 28 18:04:03 2003
@@ -14,6 +14,7 @@
 
 
 import Acquisition
+from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 from interfaces import ISlot, ISlotProvider
 
@@ -22,6 +23,9 @@
 
     __implements__ = ISlot
 
+    security = ClassSecurityInfo()
+    security.setDefaultAccess('allow')
+
     def single(self):
         return ''
 
@@ -29,6 +33,7 @@
         return ()
 
 mock_slot = MockSlot()
+InitializeClass(MockSlot)
 
 
 class SlotNameCollector (Acquisition.Explicit):
@@ -56,4 +61,4 @@
 
     def _getLayeredProvider():
         return None
-
+InitializeClass(SlotNameCollector)