[Buildbot-commits] buildbot/buildbot/status/web base.py, 1.8, 1.9 waterfall.py, 1.17, 1.18

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30075/buildbot/status/web

Modified Files:
	base.py waterfall.py 
Log Message:
[project @ webstatus: make sure we use relative paths for help/welcome pages]

Original author: warner at lothar.com
Date: 2007-09-25 22:42:45+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/base.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- base.py	13 Aug 2007 08:20:51 -0000	1.8
+++ base.py	25 Sep 2007 22:50:31 -0000	1.9
@@ -163,9 +163,10 @@
         return request.site.buildbot_service.parent.change_svc
 
     def path_to_root(self, request):
-        segs = len(request.prepath)
-        if request.prepath and request.prepath[-1] == '':
-            segs -= 1
+        if request.prepath:
+            segs = len(request.prepath) - 1
+        else:
+            segs = 0
         root = "../" * segs
         return root
 

Index: waterfall.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/waterfall.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- waterfall.py	13 Aug 2007 17:22:54 -0000	1.17
+++ waterfall.py	25 Sep 2007 22:50:31 -0000	1.18
@@ -531,11 +531,15 @@
                                  for k in newargs
                                  for v in newargs[k]
                                  ])
-            new_url = req.URLPath()
             if new_path:
-                new_url.path = new_path
-            new_url.query = newquery
-            return str(new_url)
+                new_url = new_path
+            elif req.prepath:
+                new_url = req.prepath[-1]
+            else:
+                new_url = ''
+            if newquery:
+                new_url += "?" + newquery
+            return new_url
 
         if timestamps:
             bottom = timestamps[-1]