[Zapp-cvs-commit] ZApp ZApp_CMFBase.py,1.16.2.1,1.16.2.2

[<ssp...@us...>]

Update of /cvsroot/zapp/ZApp
In directory sc8-pr-cvs1:/tmp/cvs-serv19993

Modified Files:
      Tag: CMF_relations
	ZApp_CMFBase.py 
Log Message:
try skinned folder?

Index: ZApp_CMFBase.py
===================================================================
RCS file: /cvsroot/zapp/ZApp/ZApp_CMFBase.py,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -d -r1.16.2.1 -r1.16.2.2
*** ZApp_CMFBase.py	8 Oct 2003 20:37:47 -0000	1.16.2.1
--- ZApp_CMFBase.py	13 Oct 2003 19:36:51 -0000	1.16.2.2
***************
*** 26,31 ****
  #
  
- from Products.CMFCore.PortalContent import PortalContent
  from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
  from AccessControl import ClassSecurityInfo, getSecurityManager
  from Products.CMFCore import CMFCorePermissions
--- 26,31 ----
  #
  
  from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl
+ from Products.CMFDefault.SkinnedFolder import SkinnedFolder
  from AccessControl import ClassSecurityInfo, getSecurityManager
  from Products.CMFCore import CMFCorePermissions
***************
*** 40,52 ****
  import tempfile
  
! class ZApp_CMFBase(FreeRangeDS, ZApp_Base, PortalContent, DefaultDublinCoreImpl, ZApp_MiscDataUser, ZApp_RelatedObject):
  
      meta_type = 'ZApp CMF Content Type'
      zapp_cmf_type = 1
  
-     __implements__ = ( PortalContent.__implements__
-                      , DefaultDublinCoreImpl.__implements__
-                      )
- 
      _primaryKeyStringSize=255  # allow for a pretty rediculous size...
      _primaryKeyGenerator='self.calcPathID()'
--- 40,48 ----
  import tempfile
  
! class ZApp_CMFBase(FreeRangeDS, ZApp_Base, SkinnedFolder, DefaultDublinCoreImpl, ZApp_MiscDataUser, ZApp_RelatedObject):
  
      meta_type = 'ZApp CMF Content Type'
      zapp_cmf_type = 1
  
      _primaryKeyStringSize=255  # allow for a pretty rediculous size...
      _primaryKeyGenerator='self.calcPathID()'
***************
*** 54,58 ****
      
  
!     manage_options = PortalContent.manage_options
  
      def getPrimaryKeyValue(self):
--- 50,54 ----
      
  
!     manage_options = SkinnedFolder.manage_options
  
      def getPrimaryKeyValue(self):
***************
*** 159,163 ****
          cmf_portal_type = getattr(self, '_v_cmf_portal_type','')
                  
!         PortalContent.manage_afterAdd(self, item, container)
          ZApp_Base.manage_afterAdd(self, item, container)
          
--- 155,159 ----
          cmf_portal_type = getattr(self, '_v_cmf_portal_type','')
                  
!         SkinnedFolder.manage_afterAdd(self, item, container)
          ZApp_Base.manage_afterAdd(self, item, container)