[Zope3-checkins] CVS: Packages3/workflow/stateful - xmlexport_template.pt:1.3 xmlimportexport.py:1.7

[Ulrich Eck]

Update of /cvs-repository/Packages3/workflow/stateful
In directory cvs.zope.org:/tmp/cvs-serv17691/stateful

Modified Files:
	xmlexport_template.pt xmlimportexport.py 
Log Message:
adding tests for workflow-directives, globalimportexport, xmlimportexport
updates for xmlexporttemplate to handle scripts and permissions correctly


=== Packages3/workflow/stateful/xmlexport_template.pt 1.2 => 1.3 ===
--- Packages3/workflow/stateful/xmlexport_template.pt:1.2	Thu Mar 27 05:55:58 2003
+++ Packages3/workflow/stateful/xmlexport_template.pt	Mon Apr  7 13:33:50 2003
@@ -3,21 +3,38 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   tal:define="wf view/getDefinition"
   tal:attributes="title python:view.getDublinCore(wf).Title()">
-  <schema tal:attributes="name wf/getRelevantDataSchema"></schema>
+
+  <schema 
+    name = ""
+    tal:attributes="name wf/getRelevantDataSchema">
+  </schema>
+
   <states>
     <state
+      title = ""
+      name = ""
       tal:repeat="state wf/getStateNames"
       tal:attributes="title python:view.getDublinCore(wf.getState(state)).Title();
                       name  state"></state>
   </states>
+
   <transitions>
     <tal:block tal:repeat="trans wf/getTransitionNames"> 
       <transition
+        sourceState = ""
+        destinationState = ""
+        condition = ""
+        script = ""
+        permission = ""
+        triggerMode = ""
+        title = ""
+        name = ""
         tal:define="transObj python:wf.getTransition(trans)"
         tal:attributes="sourceState      transObj/getSourceState;
                         destinationState transObj/getDestinationState;
                         condition        transObj/getCondition;
-                        permission       transObj/getPermission;
+                        script           transObj/getScript;
+                        permission       python:view.getPermissionId(transObj.getPermission());
                         triggerMode      transObj/getTriggerMode;
                         title            python:view.getDublinCore(transObj).Title();
                         name             trans"></transition>


=== Packages3/workflow/stateful/xmlimportexport.py 1.6 => 1.7 ===
--- Packages3/workflow/stateful/xmlimportexport.py:1.6	Fri Mar 28 13:16:37 2003
+++ Packages3/workflow/stateful/xmlimportexport.py	Mon Apr  7 13:33:50 2003
@@ -25,7 +25,9 @@
 from zope.component import getAdapter, getServiceManager
 from zope.app.interfaces.dublincore import IZopeDublinCore
 from types import StringTypes
-from zope.proxy.context import ContextMethod 
+from zope.proxy.context import ContextMethod
+from zope.proxy.introspection import removeAllProxies
+from zope.security.checker import CheckerPublic
 
 from xml.sax import parse
 from xml.sax.handler import ContentHandler
@@ -124,4 +126,11 @@
 
     def getDublinCore(self, obj):
         return getAdapter(obj, IZopeDublinCore)
+
+    def getPermissionId(self, permission):
+        if isinstance(permission, str):
+            return permission
+        if permission is CheckerPublic:
+            return 'zope.Public'
+        return removeAllProxies(permission).getId()