[CMF-checkins] CVS: CMF - metadataElementPolicies.dtml:1.2

tseaver@digicool.com tseaver@digicool.com
Mon, 21 May 2001 01:07:18 -0400 (EDT)


Update of /cvs-repository/CMF/CMFDefault/dtml
In directory korak.digicool.com:/tmp/cvs-serv1203/dtml

Modified Files:
	metadataElementPolicies.dtml 
Log Message:


 - Fix glitch in display of multi-valued defaults (e.g., Subject).



--- Updated File metadataElementPolicies.dtml in package CMF --
--- metadataElementPolicies.dtml	2001/04/28 22:57:00	1.1
+++ metadataElementPolicies.dtml	2001/05/21 05:07:18	1.2
@@ -25,7 +25,8 @@
  </tr>
 
  <dtml-let spec="getElementSpec( element=REQUEST[ 'element' ] )"
-           tokenz="spec.isMultiValued() and ':tokens' or ''"
+           multi="spec.isMultiValued()"
+           tokenz="multi and ':tokens' or ''"
  >
 
  <dtml-in expr="spec.listPolicies()" sort>
@@ -36,7 +37,8 @@
            rqd="policy.isRequired() and 'checked' or ''"
            canRemove="key is not _.None"
            supply="policy.supplyDefault() and 'checked' or ''"
-           defval="policy.defaultValue()"
+           rawdef="policy.defaultValue()"
+           defval="(multi and ( _.string.join( rawdef ), ) or ( rawdef, ))[0]"
            enforce="policy.enforceVocabulary() and 'checked' or ''"
            vocab="_.string.join( policy.allowedVocabulary(), '\n' )"
  >