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 d76180b3cfcbbf6ca6b7db581ae90b2ae69dd66a..6ec6db07e06d9fc620406377104a471317f5da94 100644 (file)
--- 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 03569bb7562a4d35a599d234ce62bb4ed9678828..167aa91822d10942517d3f3457de8f05fd778011 100644 (file)
--- 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 256ac3bbe13ce2ada2f41124578a953b04da87db..fd778f2d55b3203a1639aab795125c8875db8704 100644 (file)
--- 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)