From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 21 Jan 2025 15:32:31 +0000 (+0000)
Subject: builders: Fix starting/stopping builders
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ceed80786eb4ca07353723b72e9daaac99357da2;p=pbs.git

builders: Fix starting/stopping builders

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/templates/builders/start.html b/src/templates/builders/start.html
index d76180b3..6ec6db07 100644
--- a/src/templates/builders/start.html
+++ b/src/templates/builders/start.html
@@ -1,6 +1,6 @@
-{% extends "../modal.html" %}
+{% extends "modal.html" %}
 
-{% block title %}{{ _("Start Builder") }} - {{ builder }}{% end block %}
+{% block title %}{{ _("Start Builder") }} - {{ builder }}{% endblock %}
 
 {% block breadcrumbs %}
 	<nav class="breadcrumb" aria-label="breadcrumbs">
@@ -9,23 +9,23 @@
 				<a href="/builders">{{ _("Builders") }}</a>
 			</li>
 			<li>
-				<a href="/builders/{{ builder.hostname }}">{{ builder }}</a>
+				<a href="/builders/{{ builder.name }}">{{ builder }}</a>
 			</li>
 			<li class="is-active">
 				<a href="#" aria-current="page">{{ _("Start") }}</a>
 			</li>
 		</ul>
 	</nav>
-{% end block %}
+{% endblock %}
 
 {% block modal_title %}
 	<h4 class="title is-4">{{ _("Start Builder") }}</h4>
 	<h6 class="subtitle is-6">{{ builder }}</h6>
-{% end block %}
+{% endblock %}
 
 {% block modal %}
 	<form method="POST" action="">
-		{% raw xsrf_form_html() %}
+		{{ xsrf_form_html() | safe }}
 
 		<div class="content">
 			<p>
@@ -40,4 +40,4 @@
 			</button>
 		</div>
 	</form>
-{% end block %}
+{% endblock %}
diff --git a/src/templates/builders/stop.html b/src/templates/builders/stop.html
index 03569bb7..167aa918 100644
--- a/src/templates/builders/stop.html
+++ b/src/templates/builders/stop.html
@@ -1,6 +1,6 @@
-{% extends "../modal.html" %}
+{% extends "modal.html" %}
 
-{% block title %}{{ _("Stop Builder") }} - {{ builder }}{% end block %}
+{% block title %}{{ _("Stop Builder") }} - {{ builder }}{% endblock %}
 
 {% block breadcrumbs %}
 	<nav class="breadcrumb" aria-label="breadcrumbs">
@@ -9,23 +9,23 @@
 				<a href="/builders">{{ _("Builders") }}</a>
 			</li>
 			<li>
-				<a href="/builders/{{ builder.hostname }}">{{ builder }}</a>
+				<a href="/builders/{{ builder.name }}">{{ builder }}</a>
 			</li>
 			<li class="is-active">
 				<a href="#" aria-current="page">{{ _("Stop") }}</a>
 			</li>
 		</ul>
 	</nav>
-{% end block %}
+{% endblock %}
 
 {% block modal_title %}
 	<h4 class="title is-4">{{ _("Stop Builder") }}</h4>
 	<h6 class="subtitle is-6">{{ builder }}</h6>
-{% end block %}
+{% endblock %}
 
 {% block modal %}
 	<form method="POST" action="">
-		{% raw xsrf_form_html() %}
+		{{ xsrf_form_html() | safe }}
 
 		<div class="content">
 			<p>
@@ -40,4 +40,4 @@
 			</button>
 		</div>
 	</form>
-{% end block %}
+{% endblock %}
diff --git a/src/web/builders.py b/src/web/builders.py
index 256ac3bb..fd778f2d 100644
--- a/src/web/builders.py
+++ b/src/web/builders.py
@@ -203,7 +203,7 @@ class DeleteHandler(base.BaseHandler):
 class StartHandler(base.BaseHandler):
 	@base.authenticated
 	async def get(self, name):
-		builder = self.backend.builders.get_by_name(name)
+		builder = await self.backend.builders.get_by_name(name)
 		if not builder:
 			raise tornado.web.HTTPError(404, "Builder not found: %s" % name)
 
@@ -218,11 +218,11 @@ class StartHandler(base.BaseHandler):
 		if not builder.maintenance:
 			raise tornado.web.HTTPError(400, "%s is not in maintenance mode" % builder)
 
-		self.render("builders/start.html", builder=builder)
+		await self.render("builders/start.html", builder=builder)
 
 	@base.authenticated
 	async def post(self, name):
-		builder = self.backend.builders.get_by_name(name)
+		builder = await self.backend.builders.get_by_name(name)
 		if not builder:
 			raise tornado.web.HTTPError(404, "Builder not found: %s" % name)
 
@@ -245,13 +245,13 @@ class StartHandler(base.BaseHandler):
 		except:
 			raise
 
-		self.redirect("/builders/%s" % builder.hostname)
+		self.redirect("/builders/%s" % builder.name)
 
 
 class StopHandler(base.BaseHandler):
 	@base.authenticated
 	async def get(self, name):
-		builder = self.backend.builders.get_by_name(name)
+		builder = await self.backend.builders.get_by_name(name)
 		if not builder:
 			raise tornado.web.HTTPError(404, "Builder not found: %s" % name)
 
@@ -266,11 +266,11 @@ class StopHandler(base.BaseHandler):
 		if not builder.maintenance:
 			raise tornado.web.HTTPError(400, "%s is not in maintenance mode" % builder)
 
-		self.render("builders/stop.html", builder=builder)
+		await self.render("builders/stop.html", builder=builder)
 
 	@base.authenticated
 	async def post(self, name):
-		builder = self.backend.builders.get_by_name(name)
+		builder = await self.backend.builders.get_by_name(name)
 		if not builder:
 			raise tornado.web.HTTPError(404, "Builder not found: %s" % name)
 
@@ -293,4 +293,4 @@ class StopHandler(base.BaseHandler):
 		except:
 			raise
 
-		self.redirect("/builders/%s" % builder.hostname)
+		self.redirect("/builders/%s" % builder.name)