[Checkins] SVN: Products.CMFDefault/branches/2.2/Products/CMFDefault/ Fixed AttributeError for allowDiscussion when importing a GenericSetup structure tarball.

Maurits van Rees cvs-admin at zope.org
Thu Jan 17 17:58:00 UTC 2013


Log message for revision 129047:
  Fixed AttributeError for allowDiscussion when importing a GenericSetup structure tarball.
  
  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/version.txt

-=-
Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt	2013-01-17 15:55:38 UTC (rev 129046)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/CHANGES.txt	2013-01-17 17:57:59 UTC (rev 129047)
@@ -1,6 +1,13 @@
 Products.CMFDefault Changelog
 =============================
 
+2.2.4 (unreleased)
+------------------
+
+- Fixed AttributeError for allowDiscussion when importing a
+  GenericSetup structure tarball.
+  See https://bugs.launchpad.net/zope-cmf/+bug/1042836/
+
 2.2.3 (2012-08-28)
 ------------------
 

Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/DiscussionTool.py
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/DiscussionTool.py	2013-01-17 15:55:38 UTC (rev 129046)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/DiscussionTool.py	2013-01-17 17:57:59 UTC (rev 129047)
@@ -79,6 +79,10 @@
                     pass
         else:
             # https://bugs.launchpad.net/zope-cmf/+bug/1042836/
+            if allowDiscussion in ('True', 'true', 'on'):
+                allowDiscussion = True
+            elif allowDiscussion in ('False', 'false', 'off'):
+                allowDiscussion = False
             content.allow_discussion = bool(int(allowDiscussion))
 
     security.declarePublic( 'getDiscussionFor' )

Modified: Products.CMFDefault/branches/2.2/Products/CMFDefault/version.txt
===================================================================
--- Products.CMFDefault/branches/2.2/Products/CMFDefault/version.txt	2013-01-17 15:55:38 UTC (rev 129046)
+++ Products.CMFDefault/branches/2.2/Products/CMFDefault/version.txt	2013-01-17 17:57:59 UTC (rev 129047)
@@ -1 +1 @@
-2.2.3
+2.2.4.dev0



More information about the checkins mailing list