--- ECHO_content/ECHO_collection.py 2004/05/06 15:53:01 1.59 +++ ECHO_content/ECHO_collection.py 2004/05/07 13:01:56 1.61 @@ -577,7 +577,7 @@ class ECHO_collection(Folder, Persistent security=ClassSecurityInfo() meta_type='ECHO_collection' - "'displayTypes=displayTypes + displayTypes=displayTypes def getTitle(self): """title""" @@ -644,14 +644,14 @@ class ECHO_collection(Folder, Persistent element=getattr(object,entry) try: if element.meta_type in ["ECHO_collection","ECHO_group"]: - collections+="" + collections+="" collections+=getCollection(element,depth)+"\n" except: """nothing""" return collections - - return ""+getCollection(self)+"" + ret="""""" + return ret+""+getCollection(self)+"" def createJavaScript(self): """CreateJava""" @@ -942,8 +942,8 @@ class ECHO_group(ECHO_collection): def index_html(self): """standard page""" displayedObjects=self.ZopeFind(self,obj_metatypes=displayTypes) - 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 (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')() @@ -1186,9 +1186,11 @@ class ECHO_root(Folder,Persistent,Implic def getPartnersXML(self): """partner liste als xml""" partners=self.getPartners() - ret="" - for partner in partners: - ret+="""\n"""%(partner.getId(),partner.title) + ret=""" + """ + + for partner in partners: + ret+="""\n"""%(partner.getId(),unicode(partner.title,'utf-8','replace')) return ret+"\n"