Webquest Webquest.py,1.4,1.5 WebquestFolder.py,1.4,1.5

Update of /cvsroot/eduplone/Webquest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22186

Modified Files:
	Webquest.py WebquestFolder.py 
Log Message:
OrderedBaseFolder inheritance and template fixes  


Index: WebquestFolder.py
===================================================================
RCS file: /cvsroot/eduplone/Webquest/WebquestFolder.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WebquestFolder.py	9 Dec 2004 14:58:53 -0000	1.4
--- WebquestFolder.py	7 Jan 2005 01:54:20 -0000	1.5
***************
*** 5,15 ****
  
  from Products.Archetypes.public import *
- # Workaround for the 1.2.3 OrderedBaseFolder class to work with Plone
- #from Products.Webquest.OrderedBaseFolder import OrderedBaseFolder
  from AccessControl import ClassSecurityInfo
  from Products.CMFCore import CMFCorePermissions
  
  
! schema = BaseFolderSchema + Schema((
      TextField('text',
                 searchable=1,
--- 5,13 ----
  
  from Products.Archetypes.public import *
  from AccessControl import ClassSecurityInfo
  from Products.CMFCore import CMFCorePermissions
  
  
! schema = OrderedBaseFolderSchema + Schema((
      TextField('text',
                 searchable=1,
***************
*** 26,30 ****
   
  
! class WebquestFolder(BaseFolder):
      """A simple folderish archetype"""
      schema = schema
--- 24,28 ----
   
  
! class WebquestFolder(OrderedBaseFolder):
      """A simple folderish archetype"""
      schema = schema

Index: Webquest.py
===================================================================
RCS file: /cvsroot/eduplone/Webquest/Webquest.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Webquest.py	9 Dec 2004 14:58:53 -0000	1.4
--- Webquest.py	7 Jan 2005 01:54:20 -0000	1.5
***************
*** 14,18 ****
  
  
! schema = BaseFolderSchema.copy() + Schema((
      TextField('text',
                 required=1,
--- 14,18 ----
  
  
! schema = OrderedBaseFolderSchema.copy() + Schema((
      TextField('text',
                 required=1,
***************
*** 31,35 ****
   
  
! class Webquest(BaseFolder):
      """A simple folderish archetype"""
      schema = schema
--- 31,35 ----
   
  
! class Webquest(OrderedBaseFolder):
      """A simple folderish archetype"""
      schema = schema
***************
*** 99,124 ****
  
          if not '10' in self.objectIds():
!             self.invokeFactory(type_name='WebquestDoc',
!                                id='10')
              self['10'].title = self.langmap[lang]['10']
          if not '20' in self.objectIds():
!             self.invokeFactory(type_name='WebquestDoc',
!                                id='20')
              self['20'].title = self.langmap[lang]['20']
          if not '30' in self.objectIds():
!             self.invokeFactory(type_name='WebquestDoc',
!                            id='30')
              self['30'].title = self.langmap[lang]['30']
          if not '40' in self.objectIds():
!             self.invokeFactory(type_name='WebquestFolder',
!                            id='40')
              self['40'].title = self.langmap[lang]['40']
          if not '50' in self.objectIds():
!             self.invokeFactory(type_name='WebquestDoc',
!                            id='50')
              self['50'].title = self.langmap[lang]['50']
          if not '60' in self.objectIds():
!             self.invokeFactory(type_name='WebquestDoc',
!                            id='60')
              self['60'].title = self.langmap[lang]['60']
  
--- 99,118 ----
  
          if not '10' in self.objectIds():
!             self.invokeFactory('WebquestDoc', '10')
              self['10'].title = self.langmap[lang]['10']
          if not '20' in self.objectIds():
!             self.invokeFactory('WebquestDoc', '20')
              self['20'].title = self.langmap[lang]['20']
          if not '30' in self.objectIds():
!             self.invokeFactory('WebquestDoc', '30')
              self['30'].title = self.langmap[lang]['30']
          if not '40' in self.objectIds():
!             self.invokeFactory('WebquestFolder', '40')
              self['40'].title = self.langmap[lang]['40']
          if not '50' in self.objectIds():
!             self.invokeFactory('WebquestDoc', '50')
              self['50'].title = self.langmap[lang]['50']
          if not '60' in self.objectIds():
!             self.invokeFactory('WebquestDoc', '60')
              self['60'].title = self.langmap[lang]['60']
  



-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt