--- ECHO_content/ECHO_collection.py 2004/05/06 13:05:49 1.54 +++ ECHO_content/ECHO_collection.py 2004/05/06 15:53:01 1.59 @@ -577,6 +577,8 @@ class ECHO_collection(Folder, Persistent security=ClassSecurityInfo() meta_type='ECHO_collection' + "'displayTypes=displayTypes + def getTitle(self): """title""" return self.title.encode('utf-8') @@ -857,7 +859,7 @@ class ECHO_collection(Folder, Persistent elif hasattr(self,'collection_index_template'): return self.collection_index_template() elif hasattr(self,'main_index_template'): - return self.collection_index_template() + return self.main_index_template() pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self) pt.content_type="text/html" @@ -940,18 +942,20 @@ class ECHO_group(ECHO_collection): def index_html(self): """standard page""" 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()) if 'index.html' in self.__dict__.keys(): return getattr(self,'index.html')() - + elif 'overview' in self.__dict__.keys(): - return self.showOverview() + return self.showOverview() elif hasattr(self,'group_index_template'): - return self.group_index_template() + return self.group_index_template() + elif hasattr(self,'collection_index_template'): + return self.collection_index_template() elif hasattr(self,'main_index_template'): - return self.collection_index_template() + return self.main_index_template() pt=PageTemplateFile('Products/ECHO_content/zpt/ECHO_main_index_template_standard.zpt').__of__(self) pt.content_type="text/html"