[BACK]Return to ECHO_collection.py CVS log [TXT] [DIR] Up to [Repository] / ECHO_content

Diff for /ECHO_content/ECHO_collection.py between versions 1.52 and 1.59

version 1.52, 2004/05/06 10:27:07 version 1.59, 2004/05/06 15:53:01
Line 551  class ECHO_link(ECHO_externalLink): Line 551  class ECHO_link(ECHO_externalLink):
     meta_type="ECHO_link"      meta_type="ECHO_link"
           
   
       def content_html(self):
           """template fuer content"""
           return content_html(self,'link')
       
 def manage_addECHO_linkForm(self):  def manage_addECHO_linkForm(self):
         """Form for external Links"""          """Form for external Links"""
         pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_linkForm.zpt').__of__(self)          pt=PageTemplateFile('Products/ECHO_content/zpt/AddECHO_linkForm.zpt').__of__(self)
Line 573  class ECHO_collection(Folder, Persistent Line 577  class ECHO_collection(Folder, Persistent
     security=ClassSecurityInfo()      security=ClassSecurityInfo()
     meta_type='ECHO_collection'      meta_type='ECHO_collection'
   
       "'displayTypes=displayTypes
               
     def getTitle(self):      def getTitle(self):
     """title"""      """title"""
     return self.title.encode('utf-8')       return self.title.encode('utf-8') 
Line 852  class ECHO_collection(Folder, Persistent Line 858  class ECHO_collection(Folder, Persistent
             return self.showOverview()              return self.showOverview()
         elif hasattr(self,'collection_index_template'):          elif hasattr(self,'collection_index_template'):
             return self.collection_index_template()                  return self.collection_index_template()    
           elif hasattr(self,'main_index_template'):
               return self.main_index_template()    
                   
         pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_collection_index_standard.zpt').__of__(self)          pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
         pt.content_type="text/html"          pt.content_type="text/html"
         return pt()          return pt()
   
Line 934  class ECHO_group(ECHO_collection): Line 942  class ECHO_group(ECHO_collection):
     def index_html(self):      def index_html(self):
         """standard page"""          """standard page"""
         displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)          displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes)
         if len(displayedObjects)==1: # nur ein Object dann redirect auf dieses Object          if (len(displayedObjects)==1) and (displayedObjects[0][1].meta_type=="ECHO_collection"): # nur ein Object dann redirect auf dieses Object
             return self.REQUEST.RESPONSE.redirect(displayedObjects[0][1].absolute_url())              return self.REQUEST.RESPONSE.redirect(displayedObjects[0][1].absolute_url())
                   
         if 'index.html' in self.__dict__.keys():          if 'index.html' in self.__dict__.keys():
Line 946  class ECHO_group(ECHO_collection): Line 954  class ECHO_group(ECHO_collection):
             return self.group_index_template()                 return self.group_index_template()   
         elif hasattr(self,'collection_index_template'):          elif hasattr(self,'collection_index_template'):
             return self.collection_index_template()                  return self.collection_index_template()    
           elif hasattr(self,'main_index_template'):
               return self.main_index_template()    
   
         pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_group_index_standard.zpt').__of__(self)          pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self)
         pt.content_type="text/html"          pt.content_type="text/html"
         return pt()          return pt()
   
Removed from v.1.52  
changed lines
  Added in v.1.59

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