[CMF-checkins] CVS: Products/CMFTopic/skins/topic - listc_edit.dtml:1.3.30.1

[Tres Seaver]

Update of /cvs-repository/Products/CMFTopic/skins/topic
In directory cvs.zope.org:/tmp/cvs-serv23591/CMFTopic/skins/topic

Modified Files:
      Tag: tseaver-listcrit_operator-branch
	listc_edit.dtml 
Log Message:


  - Add 'operator' attribute to ListCriterion, to permit overriding the
    implicit 'or' operator used for keyword indexes such as 'Subject'.


=== Products/CMFTopic/skins/topic/listc_edit.dtml 1.3 => 1.3.30.1 ===
  <tr valign="top">
   <td width="20">&nbsp;</td>
-  <td><strong>Value:</strong><br>
-  <textarea name="criteria.value:lines:records" rows="5" cols="40"
-   ><dtml-var expr="_.string.join(value, '\n')"></textarea></td>
+  <td>
+   <strong>Value:</strong><br>
+   <textarea name="criteria.value:lines:records" rows="5" cols="40"
+   ><dtml-var expr="_.string.join(value, '\n')"></textarea><br>
+   <strong>Operator:</strong><br>
+   <dtml-let noneSel="not operator and 'selected' or ''"
+             orSel="operator == 'or' and 'selected' or ''"
+             andSel="operator == 'and' and 'selected' or ''">
+   <select name="criteria.operator:records">
+    <option value="" &dtml-noneSel;>-- none --</option>
+    <option value="or" &dtml-orSel;>or</option>
+    <option value="and" &dtml-andSel;>and</option>
+   </select>
+   </dtml-let>
+  </td>
  </tr>
 </table>