[CMF-checkins] CVS: CMF/DCWorkflow/dtml - worklist_properties.dtml:1.2 worklists.dtml:1.2

[Florent Guillaume]

Update of /cvs-repository/CMF/DCWorkflow/dtml
In directory cvs.zope.org:/tmp/cvs-serv17697/DCWorkflow/dtml

Modified Files:
	worklist_properties.dtml worklists.dtml 
Log Message:
Made the DCWorkflow worklists accept a list of formatted values for
cataloged variable matches. The separator is a semicolon (Tracker #496).

Added a small 'worklists.stx' documentation file.

Also document the previously-added 'user_id' variable in actbox.stx.


=== CMF/DCWorkflow/dtml/worklist_properties.dtml 1.1 => 1.2 ===
 <th align="left" valign="top">
   <div class="form-label">
-  Cataloged variable matches
+  Cataloged variable matches (formatted)
   </div>
 </th>
 <td>
@@ -28,7 +28,7 @@
     <tr>
      <th align="left">&dtml-sequence-item; =</th>
      <td>
-      <dtml-let value="getVarMatch(_['sequence-item'])">
+      <dtml-let value="getVarMatchText(_['sequence-item'])">
        <input type="text" name="var_match_&dtml-sequence-item;"
         value="&dtml-value;" />
       </dtml-let>


=== CMF/DCWorkflow/dtml/worklists.dtml 1.1 => 1.2 ===
     Catalog matches:
     <dtml-in expr="var_matches.items()" sort>
-     <code>&dtml-sequence-key;</code> = <code>&dtml-sequence-item;</code>
+     <code>&dtml-sequence-key;</code> =
+     <dtml-in sequence-item>
+       <code>&dtml-sequence-item;</code>
+       <dtml-unless sequence-end>or</dtml-unless>
+     </dtml-in>
     <dtml-unless sequence-end>;</dtml-unless>
     </dtml-in>
     <br />