--- ECHO_content/ECHO_Nav.py 2004/05/06 10:27:07 1.18 +++ ECHO_content/ECHO_Nav.py 2004/05/06 10:42:58 1.19 @@ -303,19 +303,21 @@ class ECHO_navigation(Folder): RESPONSE.redirect('manage_main') - def getColls(self,obj,depth): + def getColls(self,obj,depth,checkOnly="no"): nav={} #print "HERE",obj. for x_objs in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes): x=x_objs[1] - x = checkOnlyOneInGroup(x) + print checkOnly,x.label + if checkOnly=="yes": + x = checkOnlyOneInGroup(x) if depth>1: nav[x.getId()]=(self.getColls(x,depth-1),x) else: nav[x.getId()]=(None,x) return nav - def createNavHash(self,depth): + def createNavHash(self,depth,checkOnly="no"): """Auslesen des Hierarchiebuames""" temp=self.pathToHierarchy[0:] temp=re.sub("/",".",temp) @@ -333,7 +335,7 @@ class ECHO_navigation(Folder): if x.meta_type in self.displayedMetaTypes: if depth>1: - nav[x.getId()]=(self.getColls(x,int(depth)-1),x) + nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x) else: nav[x.getId()]=(None,x) @@ -513,7 +515,7 @@ class ECHO_navigation(Folder): def secondNavElements(self): """Zweite Ordnung""" - hash=self.createNavHash(2) + hash=self.createNavHash(2,checkOnly="yes") actual_url=self.REQUEST['URL'] ult_temp=re.sub(self.absolute_url(),"",actual_url)