[Zope3-checkins] SVN: Zope3/branches/3.3/ Merge fix for #696 from trunk

[Martijn Pieters]

Log message for revision 69761:
  Merge fix for #696 from trunk

Changed:
  U   Zope3/branches/3.3/doc/CHANGES.txt
  U   Zope3/branches/3.3/src/zope/app/form/browser/configure.zcml

-=-
Modified: Zope3/branches/3.3/doc/CHANGES.txt
===================================================================
--- Zope3/branches/3.3/doc/CHANGES.txt	2006-08-24 13:46:08 UTC (rev 69760)
+++ Zope3/branches/3.3/doc/CHANGES.txt	2006-08-24 13:48:38 UTC (rev 69761)
@@ -6,6 +6,13 @@
 
   For information on future releases, see ROADMAP.txt.
 
+  Zope 3.3.0xx (unreleased)
+
+    Bugfixes
+
+      - Fixed issue 696: No display widget was registered for ISet fields with
+        a IChoice(IBaseVocabulary) value type.
+
   Zope 3.3.0b2 (2006/08/18)
 
     New features

Modified: Zope3/branches/3.3/src/zope/app/form/browser/configure.zcml
===================================================================
--- Zope3/branches/3.3/src/zope/app/form/browser/configure.zcml	2006-08-24 13:46:08 UTC (rev 69760)
+++ Zope3/branches/3.3/src/zope/app/form/browser/configure.zcml	2006-08-24 13:48:38 UTC (rev 69761)
@@ -448,6 +448,15 @@
       />
 
   <view
+        type="zope.publisher.interfaces.browser.IBrowserRequest"
+        for="zope.schema.interfaces.ISet
+        zope.schema.interfaces.IBaseVocabulary"
+        provides="zope.app.form.interfaces.IDisplayWidget"
+        factory=".SetDisplayWidget"
+        permission="zope.Public"
+        />
+
+  <view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="zope.schema.interfaces.IList
            zope.schema.interfaces.IVocabularyTokenized"