[Checkins] SVN: Products.CMFDefault/branches/2.2/Products/CMFDefault/ Fix explicitly disabling discussion on a content item.

[Tres Seaver]

Log message for revision 127605:
  Fix explicitly disabling discussion on a content item.
  
  See https://bugs.launchpad.net/zope-cmf/+bug/1042836/
  
  

Changed:
  U   Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/branches/2.2/Products/CMFDefault/DiscussionTool.py
  U   Products.CMFDefault/branches/2.2/Products/CMFDefault/tests/test_DiscussionTool.py

-=-
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt	2012-08-28 16:42:29 UTC (rev 127604)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt	2012-08-28 16:59:48 UTC (rev 127605)
@@ -4,6 +4,9 @@
 2.2.3 (unreleased)
 ------------------
 
+- Fixed explicitly disabling discussion on a content item.
+  See https://bugs.launchpad.net/zope-cmf/+bug/1042836/
+
 - Declared dependency on zope.app.locales.
 
 - Added a 'MANIFEST.in' file.

Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/DiscussionTool.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/DiscussionTool.py	2012-08-28 16:42:29 UTC (rev 127604)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/DiscussionTool.py	2012-08-28 16:59:48 UTC (rev 127605)
@@ -78,7 +78,8 @@
                     # https://bugs.launchpad.net/zope-cmf/+bug/162532
                     pass
         else:
-            content.allow_discussion = bool(allowDiscussion)
+            # https://bugs.launchpad.net/zope-cmf/+bug/1042836/
+            content.allow_discussion = bool(int(allowDiscussion))
 
     security.declarePublic( 'getDiscussionFor' )
     def getDiscussionFor(self, content):

Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/tests/test_DiscussionTool.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/tests/test_DiscussionTool.py	2012-08-28 16:42:29 UTC (rev 127604)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/tests/test_DiscussionTool.py	2012-08-28 16:59:48 UTC (rev 127605)
@@ -78,6 +78,17 @@
         except AttributeError:
             self.fail('Launchpad issue 162532: AttributeError raised')
 
+    def test_overrideDiscussionFor_w_string_numerics(self):
+        # See https://bugs.launchpad.net/zope-cmf/+bug/1042836/
+        dtool = self.site.portal_discussion
+        foo = self.site._setObject( 'foo', DummyFolder() )
+
+        dtool.overrideDiscussionFor(foo, '0')
+        self.assertEqual(foo.aq_base.allow_discussion, False)
+
+        dtool.overrideDiscussionFor(foo, '1')
+        self.assertEqual(foo.aq_base.allow_discussion, True)
+
     def test_isDiscussionAllowedFor(self):
         # Test for Collector issue #398 (allow_discussion wrongly
         # acquired and used from parent)