Merge commit 'ab7716e4387e116eaecd5c39b1309f756607943d' into jinja

Conflicts: buildbot/status/web/slaves.py
djmitche · Dec 13, 2009 · e80ccd6 · e80ccd6
2 parents ba25197 + ab7716e
commit e80ccd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/buildbot/status/web/builder.py b/buildbot/status/web/builder.py
@@ -44,7 +44,8 @@ def builder(self, build, req):
             b['current_step'] = "[waiting for Lock]"
             # TODO: is this necessarily the case?
 
-        if self.builder_control is not None:
+        builder_control = self.getControl(req)
+        if builder_control is not None:
             b['stop_url'] = path_to_build(req, build) + '/stop'
 
         return b

diff --git a/buildbot/status/web/slaves.py b/buildbot/status/web/slaves.py
@@ -44,7 +44,7 @@ def content(self, request, ctx):
                     current_builds.append(self.get_line_values(request, cb))
 
         try:
-            max_builds = int(request.args.get('builds')[0])
+            max_builds = int(request.args.get('numbuilds')[0])
         except:
             max_builds = 10