*** empty log message ***

lib/python/OFS/DTMLDocument.py

@@ -102,7 +102,8 @@
 ##############################################################################
 """DTML Document objects."""
 
-__version__='$Revision: 1.3 $'[11:-2]
+__version__='$Revision: 1.4 $'[11:-2]
+from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from ZPublisher.Converters import type_converters
 from Globals import HTML, HTMLFile, MessageDialog
 from DTMLMethod import DTMLMethod, decapitate
@@ -217,13 +218,34 @@ class DTMLDocument(DTMLMethod, PropertyManager):
         Response, and key word arguments."""
         kw['document_id']   =self.id
         kw['document_title']=self.title
+
         if client is None:
             # Called as subtemplate, so don't need error propigation!
             #__traceback_info__=(`self.__name__`, `self`, `self.aq_parent`)
-            r=apply(HTML.__call__, (self, client, REQUEST), kw)
+            r=apply(HTML.__call__, (self, self, REQUEST), kw)
+#            try:
+#                md=REQUEST
+#                md._push(InstanceDict(self.aq_parent, md))
+#                md._push(InstanceDict(self, md))
+#                r=apply(HTML.__call__, (self, self, REQUEST), kw)
+#            finally:
+#                md._pop(1)
             if RESPONSE is None: return r
             return decapitate(r, RESPONSE)
 
+##         md=TemplateDict()
+##         push=md._push
+##         globals=self.globals
+##         shared_globals=self.shared_globals
+##         mapping=REQUEST
+##         if shared_globals: push(shared_globals)
+##         if globals: push(globals)
+##         if mapping: push(mapping)
+##         push(InstanceDict(client, md))
+##         if hasattr(mapping, 'AUTHENTICATED_USER'):
+##             md.AUTHENTICATED_USER=mapping['AUTHENTICATED_USER']
+##         md.validate=self.validate
+##         md.this=self
 
         try: r=apply(HTML.__call__, (self, self, REQUEST), kw)
         except:

lib/python/OFS/DTMLMethod.py

@@ -102,7 +102,7 @@
 ##############################################################################
 """DTML Method objects."""
 
-__version__='$Revision: 1.2 $'[11:-2]
+__version__='$Revision: 1.3 $'[11:-2]
 
 from Globals import HTML, HTMLFile, MessageDialog
 from string import join,split,strip,rfind,atoi,lower
@@ -153,7 +153,6 @@ class DTMLMethod(cDocument, HTML, Explicit, RoleManager, Item_w__name__):
         for k, v in self.__dict__.items():
             if state_name(k) or k[-11:]=='_Permission' or k[-9:]=="__roles__":
                 r[k]=v
-
         return r
    
 
@@ -162,6 +161,7 @@ class DTMLMethod(cDocument, HTML, Explicit, RoleManager, Item_w__name__):
         Response, and key word arguments."""
         kw['document_id']   =self.id
         kw['document_title']=self.title
+
         if client is None:
             # Called as subtemplate, so don't need error propigation!
             r=apply(HTML.__call__, (self, client, REQUEST), kw)