[Buildbot-devel] [PATCH 04/11] Redirect to the waterfall with the Ping/Start Build/Stop Builder buttons.

Benoit Sigoure tsuna at lrde.epita.fr
Fri Nov 16 17:12:54 UTC 2007


	I find this much more convenient than being sent back to the index
	page.  When you Ping/Start/Stop a build, the first thing you want to
	see is whether the ping worked or whether the build properly started
	is staying green or whether builder really stopped.  Or so I think.
	* buildbot/status/web/build.py (StatusResourceBuild.stop),
	* buildbot/status/web/builder.py (StatusResourceBuilder.force)
	(StatusResourceBuilder.ping): Adjust the Redirect.

Signed-off-by: Benoit Sigoure <tsuna at lrde.epita.fr>
---
 buildbot/status/web/build.py   |    4 ++--
 buildbot/status/web/builder.py |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/buildbot/status/web/build.py b/buildbot/status/web/build.py
index e3ce3d9..d3f9a35 100644
--- a/buildbot/status/web/build.py
+++ b/buildbot/status/web/build.py
@@ -187,10 +187,10 @@ class StatusResourceBuild(HtmlResource):
         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") # TODO: no longer correct
         d = defer.Deferred()
         reactor.callLater(1, d.callback, r)
         return DeferredResource(d)
diff --git a/buildbot/status/web/builder.py b/buildbot/status/web/builder.py
index 4cabf0d..870d1cf 100644
--- a/buildbot/status/web/builder.py
+++ b/buildbot/status/web/builder.py
@@ -177,12 +177,12 @@ class StatusResourceBuilder(HtmlResource, OneLineMixin):
             # 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":
-- 
1.5.3.5.654.gdd5ec





More information about the devel mailing list