Archetypes ExtensibleMetadata.py,1.12,1.13

Update of /cvsroot/archetypes/Archetypes
In directory sc8-pr-cvs1:/tmp/cvs-serv15596

Modified Files:
        ExtensibleMetadata.py 
Log Message:
fix allowDiscussion

Index: ExtensibleMetadata.py
===================================================================
RCS file: /cvsroot/archetypes/Archetypes/ExtensibleMetadata.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ExtensibleMetadata.py       8 Aug 2003 11:14:57 -0000       1.12
--- ExtensibleMetadata.py       8 Aug 2003 15:50:41 -0000       1.13
***************
*** 8,12 ****
  from Products.CMFCore  import CMFCorePermissions
  from Products.CMFCore.utils  import getToolByName
- from types import StringType
  
  from interfaces.metadata import IExtensibleMetadata
--- 8,11 ----
***************
*** 123,127 ****
          self.modification_date = now
  
!     def isDiscussable(self):
          result = None
          try:
--- 122,126 ----
          self.modification_date = now
  
!     def isDiscussable(self, encoding=None):
          result = None
          try:
***************
*** 136,148 ****
                  allowDiscussion = int(allowDiscussion)
              except:
!                 if type(allowDiscussion) == StringType:
!                     allowDiscussion = allowDiscussion.lower().strip()
!                     allowDiscussion = {'on' : 1, 'off': 0, 
'none':None}.get(allowDiscussion, None)
! 
!             try:
!                 getToolByName(self, 
'portal_discussion').overrideDiscussionFor(self, allowDiscussion)
!             except:
!                 log_exc()
!                 pass
              
      
--- 135,142 ----
                  allowDiscussion = int(allowDiscussion)
              except:
!                 allowDiscussion = allowDiscussion.lower().strip()
!                 allowDiscussion = {'on' : 1, 'off': 0,
!                                    'none':None, '':None}.get(allowDiscussion, 
None)
!         getToolByName(self, 'portal_discussion').overrideDiscussionFor(self, 
allowDiscussion)
              
      




-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01