Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19356/buildbot/status/web
Modified Files:
build.py builder.py
Log Message:
[project @ more #138: after force/stop/ping, redirect back to waterfall, not index page]
Original author: warner at lothar.com
Date: 2007-11-21 08:56:10+00:00
Index: build.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/build.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- build.py 10 Oct 2007 08:23:06 -0000 1.14
+++ build.py 21 Nov 2007 09:22:49 -0000 1.15
@@ -187,10 +187,10 @@
c.stopBuild(reason)
# we're at http://localhost:8080/svn-hello/builds/5/stop?[args] and
# we want to go to: http://localhost:8080/svn-hello/builds/5 or
- # http://localhost:8080/
+ # http://localhost:8080/waterfall
#
#return Redirect("../%d" % self.build.getNumber())
- r = Redirect("../../..") # TODO: no longer correct
+ r = Redirect("../../../../waterfall")
d = defer.Deferred()
reactor.callLater(1, d.callback, r)
return DeferredResource(d)
Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/builder.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- builder.py 21 Nov 2007 09:22:04 -0000 1.14
+++ builder.py 21 Nov 2007 09:22:49 -0000 1.15
@@ -181,12 +181,12 @@
# TODO: tell the web user that their request could not be
# honored
pass
- return Redirect("../..")
+ return Redirect("../../waterfall")
def ping(self, req):
log.msg("web ping of builder '%s'" % self.builder_status.getName())
self.builder_control.ping() # TODO: there ought to be an ISlaveControl
- return Redirect("../..")
+ return Redirect("../../waterfall")
def getChild(self, path, req):
if path == "force":