Diff for /MPIWGWeb/MPIWGStaff.py between versions 1.6 and 1.9

version 1.6, 2004/10/01 16:44:36 version 1.9, 2005/04/25 17:16:46
Line 3  from OFS.Folder import Folder Line 3  from OFS.Folder import Folder
 from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder  from Products.ZSQLExtend.ZSQLExtend import ZSQLExtendFolder
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile  from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PageTemplates.PageTemplate import PageTemplate  from Products.PageTemplates.PageTemplate import PageTemplate
   from Products.ZCatalog.CatalogPathAwareness import CatalogAware
 import os  import os
 from Globals import package_home  from Globals import package_home
   
Line 10  from Globals import package_home Line 11  from Globals import package_home
 def getTemplate(self, tpName):  def getTemplate(self, tpName):
     """get a template file either form the instance or from the product"""      """get a template file either form the instance or from the product"""
     ext=self.ZopeFind(self.aq_parent,obj_ids=[tpName])      ext=self.ZopeFind(self.aq_parent,obj_ids=[tpName])
       
     if ext:      if ext:
         return getattr(self,ext[0][1].getId())          pt = getattr(self,ext[0][1].getId())
           else:
     pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/'+tpName)).__of__(self)      pt=PageTemplateFile(os.path.join(package_home(globals()), 'zpt/'+tpName)).__of__(self)
       assert(pt)
     return pt      return pt
   
 class MPIWGStaff(ZSQLExtendFolder):  class MPIWGStaff(CatalogAware,ZSQLExtendFolder):
     """Staff"""      """Staff"""
   
     meta_type="MPIWGStaff"      meta_type="MPIWGStaff"
       default_catalog='MembersCatalog'
       
       def PrincipiaSearchSource(self):
           """Return cataloguable key for ourselves."""
           return str(self)
   
     manage_options = Folder.manage_options+(      manage_options = Folder.manage_options+(
         {'label':'Edit','action':'changeMPIWGStaffForm'},          {'label':'Edit','action':'changeMPIWGStaffForm'},
Line 40  class MPIWGStaff(ZSQLExtendFolder): Line 46  class MPIWGStaff(ZSQLExtendFolder):
   
     def publications_full(self):      def publications_full(self):
         """show publication"""          """show publication"""
         pt=getTemplate(self, "publications_full")          pt=getTemplate(self, "publications_full_main")
         return pt()          return pt()
   
     def talks_full(self):      def talks_full(self):
         """show talks"""          """show talks"""
         pt=getTemplate(self, 'talks_full')          pt=getTemplate(self, 'talks_full_main')
         return pt()          return pt()
   
     def teaching_full(self):      def teaching_full(self):
         """show talks"""          """show talks"""
         pt=getTemplate(self, 'teaching_full')          pt=getTemplate(self, 'teaching_full_main')
         return pt()          return pt()
           
     def changeMPIWGStaffForm(self):      def changeMPIWGStaffForm(self):

Removed from v.1.6  
changed lines
  Added in v.1.9


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>