[Zope-Checkins] CVS: Zope/lib/python/OFS/dtml - properties.dtml:1.8.18.3.2.2

Toby Dickenson tdickenson@geminidataloggers.com
Fri, 31 Jan 2003 03:41:47 -0500


Update of /cvs-repository/Zope/lib/python/OFS/dtml
In directory cvs.zope.org:/tmp/cvs-serv11245

Modified Files:
      Tag: toby-charset-branch
	properties.dtml 
Log Message:
include fix for collector #737 in the fix for collector #697 - non-unicode non-lantin1 systems and wultiple selections. merging from the 2.6 branch into this sandbox branch, ready for merging into the trunk later.

=== Zope/lib/python/OFS/dtml/properties.dtml 1.8.18.3.2.1 => 1.8.18.3.2.2 ===
--- Zope/lib/python/OFS/dtml/properties.dtml:1.8.18.3.2.1	Mon Jan 27 11:21:59 2003
+++ Zope/lib/python/OFS/dtml/properties.dtml	Fri Jan 31 03:41:44 2003
@@ -135,7 +135,7 @@
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:utf8:list:string" multiple
+    <select name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">list:string" multiple
       size="<dtml-var "_.min(7, _.len(getProperty(select_variable)))">">
       <dtml-in "getProperty(select_variable)">
          <option<dtml-if 
@@ -147,7 +147,7 @@
     </div>
     <dtml-elif "_.has_key(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:utf8:list:string" multiple
+    <select name="<dtml-var id>:<dtml-var "REQUEST['management_page_charset_tag']">list:string" multiple
       size="<dtml-var "_.min(7, _.len(_[select_variable]))">">
       <dtml-in "_[select_variable]">
          <option<dtml-if