--- ECHO_content/ECHO_Nav.py 2005/10/28 17:49:45 1.64 +++ ECHO_content/ECHO_Nav.py 2005/11/24 18:31:31 1.65 @@ -676,10 +676,13 @@ class ECHO_navigation(Folder): loc=getattr(temp[x][1],'location','top') if (loc==location): - listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) - else: - listNav.append((label,createPath(self.absolute_url(),temp[x][1].absolute_url())+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) + + listNav.append((label,createPath(self,self.absolute_url(),temp[x][1].absolute_url(relative=1))+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) + else: + + listNav.append((label,createPath(self,self.absolute_url(),temp[x][1].absolute_url(relative=1))+getattr(temp[x][1],'queryString',''),temp[x][1],getattr(temp[x][1],'prefix',''),getattr(temp[x][1],'suffix',''))) + #print self.REQUEST return listNav def tempSorted(self,hash,field="weight"): @@ -780,8 +783,9 @@ class ECHO_navigation(Folder): for key in self.tempSorted(temp): description=temp[x][1].title - - url=createPath(self.absolute_url(),temp[key][1].absolute_url()) + + + url=createPath(self,self.absolute_url(),temp[key][1].absolute_url(relative=1)) if (self.REQUEST['URL']==url) | (self.REQUEST['URL']==url+"/index_html"): html=html+startTag+"[%s]" % description+endTag @@ -927,15 +931,17 @@ def manage_addECHO_navigation(self,id,ti -def createPath(url1,url2): - temp1=url1.split("/") - temp2=url2.split("/") - for test in temp1: - if temp2[0]==test: - del temp2[0] - - #print "CP:"+url1+"::"+url2+"::"+url1+"/"+string.join(temp2,"/") - return url1+"/"+string.join(temp2,"/") +def createPath(self,url1,url2): + #bugfix in absolute_url, ploetzlich erschein in absolute_url der physikalische pfad. + + vp="/".join(self.REQUEST['VirtualRootPhysicalPath']) + if vp[0]=="/": + vp=vp[1:] + + url2=url2.replace(vp+"/",'') + + + return url1+"/"+url2 def sortWeight(x,y): #print x[1],y[1]