[CMF-checkins] CVS: CMF/CMFSetup/profiles/default/workflows/default_workflow - definition.xml:1.3

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFSetup/profiles/default/workflows/default_workflow
In directory cvs.zope.org:/tmp/cvs-serv2175/CMFSetup/profiles/default/workflows/default_workflow

Modified Files:
	definition.xml 
Log Message:
- converted workflow definition descriptions to 'description' sub-elements
- removed some whitespace in xml output


=== CMF/CMFSetup/profiles/default/workflows/default_workflow/definition.xml 1.2 => 1.3 ===
--- CMF/CMFSetup/profiles/default/workflows/default_workflow/definition.xml:1.2	Mon Jul 19 14:11:37 2004
+++ CMF/CMFSetup/profiles/default/workflows/default_workflow/definition.xml	Mon Jul 19 16:08:36 2004
@@ -8,7 +8,6 @@
  <permission>View</permission>
  <state state_id="private"
         title="Non-visible and editable only by owner">
-  
   <exit-transition transition_id="submit"/>
   <exit-transition transition_id="publish"/>
   <permission-map name="Modify portal content"
@@ -29,7 +28,6 @@
 
  </state>
  <state state_id="pending" title="Waiting for reviewer">
-  
   <exit-transition transition_id="publish"/>
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>
@@ -53,7 +51,6 @@
 
  </state>
  <state state_id="published" title="Public">
-  
   <exit-transition transition_id="reject"/>
   <exit-transition transition_id="retract"/>
   <permission-map name="Modify portal content"
@@ -76,14 +73,10 @@
              title="Member retracts submission"
              new_state="private" trigger="USER"
              before_script="" after_script="">
-  
   <action url="%(content_url)s/content_retract_form"
           category="workflow">Retract</action>
   <guard>
    <guard-permission>Request review</guard-permission>
-
-
-   
   </guard>
 
  </transition>
@@ -91,14 +84,10 @@
              title="Reviewer publishes content"
              new_state="published" trigger="USER"
              before_script="" after_script="">
-  
   <action url="%(content_url)s/content_publish_form"
           category="workflow">Publish</action>
   <guard>
    <guard-permission>Review portal content</guard-permission>
-
-
-   
   </guard>
 
  </transition>
@@ -106,14 +95,10 @@
              title="Member requests publishing"
              new_state="pending" trigger="USER"
              before_script="" after_script="">
-  
   <action url="%(content_url)s/content_submit_form"
           category="workflow">Submit</action>
   <guard>
    <guard-permission>Request review</guard-permission>
-
-
-   
   </guard>
 
  </transition>
@@ -121,99 +106,73 @@
              title="Reviewer rejects submission"
              new_state="private" trigger="USER"
              before_script="" after_script="">
-  
   <action url="%(content_url)s/content_reject_form"
           category="workflow">Reject</action>
   <guard>
    <guard-permission>Review portal content</guard-permission>
-
-
-   
   </guard>
 
  </transition>
  <worklist worklist_id="reviewer_queue" title="">
-  Reviewer tasks
+  <description>Reviewer tasks</description>
   <action url="%(portal_url)s/search?review_state=pending"
           category="global">Pending (%(count)d)</action>
   <guard>
    <guard-permission>Review portal content</guard-permission>
-
-
-   
   </guard>
   <match name="review_state" values="pending"/>
  </worklist>
  <variable variable_id="action" for_catalog="False"
            for_status="True" update_always="True">
-   The last transition
-   <default>
-    
-    <expression>transition/getId|nothing</expression>
-   </default>
-   <guard>
-
-
-
-    
-   </guard>
+  <description>The last transition</description>
+  <default>
+   
+   <expression>transition/getId|nothing</expression>
+  </default>
+  <guard>
+  </guard>
  </variable>
  <variable variable_id="review_history" for_catalog="False"
            for_status="False" update_always="False">
-   Provides access to workflow history
-   <default>
-    
-    <expression>state_change/getHistory</expression>
-   </default>
-   <guard>
-    <guard-permission>Request review</guard-permission>
-    <guard-permission>Review portal content</guard-permission>
-
-
-    
-   </guard>
+  <description>Provides access to workflow history</description>
+  <default>
+   
+   <expression>state_change/getHistory</expression>
+  </default>
+  <guard>
+   <guard-permission>Request review</guard-permission>
+   <guard-permission>Review portal content</guard-permission>
+  </guard>
  </variable>
  <variable variable_id="actor" for_catalog="False"
            for_status="True" update_always="True">
-   The ID of the user who performed the last transition
-   <default>
-    
-    <expression>user/getId</expression>
-   </default>
-   <guard>
-
-
-
-    
-   </guard>
+  <description>The ID of the user who performed the last transition</description>
+  <default>
+   
+   <expression>user/getId</expression>
+  </default>
+  <guard>
+  </guard>
  </variable>
  <variable variable_id="comments" for_catalog="False"
            for_status="True" update_always="True">
-   Comments about the last transition
-   <default>
-    
-    <expression>python:state_change.kwargs.get('comment', '')</expression>
-   </default>
-   <guard>
-
-
-
-    
-   </guard>
+  <description>Comments about the last transition</description>
+  <default>
+   
+   <expression>python:state_change.kwargs.get('comment', '')</expression>
+  </default>
+  <guard>
+  </guard>
  </variable>
  <variable variable_id="time" for_catalog="False"
            for_status="True" update_always="True">
-   Time of the last transition
-   <default>
-    
-    <expression>state_change/getDateTime</expression>
-   </default>
-   <guard>
-
-
-
-    
-   </guard>
+  <description>Time of the last transition</description>
+  <default>
+   
+   <expression>state_change/getDateTime</expression>
+  </default>
+  <guard>
+  </guard>
  </variable>
 
 </dc-workflow>