builders: Fix editing builders

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

diff --git a/src/templates/builders/edit.html b/src/templates/builders/edit.html
index d507434c27969bcc344d57e4f774610c42fa236d..1390480f9e27db2cb0ba603993279f3f009aa910 100644 (file)
--- a/src/templates/builders/edit.html
+++ b/src/templates/builders/edit.html
@@ -1,6 +1,6 @@
-{% extends "../modal.html" %}
+{% extends "modal.html" %}
 
-{% block title %}{{ _("Edit Builder %s") % builder }}{% end block %}
+{% block title %}{{ _("Edit Builder %s") % builder }}{% endblock %}
 
 {% block breadcrumbs %}
        <nav class="breadcrumb" aria-label="breadcrumbs">
@@ -9,33 +9,33 @@
                                <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">{{ _("Edit") }}</a>
                        </li>
                </ul>
        </nav>
-{% end block %}
+{% endblock %}
 
 {% block modal_title %}
        <h4 class="title is-4">{{ _("Edit 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 }}
 
-               {# Hostname #}
+               {# Name #}
                <div class="field">
-                       <label class="label">{{ _("Hostname") }}</label>
+                       <label class="label">{{ _("Name") }}</label>
                        <div class="control">
                                <input class="input" type="text"
-                                       name="hostname" value="{{ builder.hostname }}" disabled>
+                                       name="name" value="{{ builder.name }}" disabled>
                        </div>
                        <p class="help">
-                               {{ _("The hostname cannot be changed") }}
+                               {{ _("The name cannot be changed") }}
                        </p>
                </div>
 
@@ -44,7 +44,7 @@
                        <div class="control">
                                <label class="checkbox">
                                        <input type="checkbox" name="enabled"
-                                               {% if builder.enabled %}checked{% end %}>
+                                               {% if builder.enabled %}checked{% endif %}>
                                        {{ _("Enabled") }}
                                </label>
                        </div>
@@ -59,7 +59,7 @@
                                <div class="control">
                                        <input class="input" type="number"
                                                name="max_jobs" value="{{ builder.max_jobs }}"
-                                               min="1" {% if builder.cpu_count %}max="{{ builder.cpu_count * 4 }}"{% end %}
+                                               min="1" {% if builder.cpu_count %}max="{{ builder.cpu_count * 4 }}"{% endif %}
                                                required>
                                </div>
                        </div>
@@ -69,7 +69,7 @@
                                <div class="control">
                                        <label class="checkbox">
                                                <input type="checkbox" name="maintenance"
-                                                       {% if builder.maintenance %}checked{% end %}>
+                                                       {% if builder.maintenance %}checked{% endif %}>
                                                {{ _("Enable Maintenance Mode") }}
                                        </label>
                                </div>
@@ -87,10 +87,10 @@
                        </div>
 
                        <div class="control">
-                               <a class="button is-danger is-outlined is-link" href="/builders/{{ builder.hostname }}/delete">
+                               <a class="button is-danger is-outlined is-link" href="/builders/{{ builder.name }}/delete">
                                        {{ _("Delete") }}
                                </a>
                        </div>
                </div>
        </form>
-{% end block %}
+{% endblock %}

diff --git a/src/web/builders.py b/src/web/builders.py
index 2f0182f84c2ba256f81b1b8f43e59ecfcaa157f2..256ac3bbe13ce2ada2f41124578a953b04da87db 100644 (file)
--- a/src/web/builders.py
+++ b/src/web/builders.py
@@ -126,8 +126,8 @@ class CreateHandler(base.BaseHandler):
 
 class EditHandler(base.BaseHandler):
        @base.authenticated
-       async def get(self, hostname):
-               builder = await self.backend.builders.get_by_name(hostname)
+       async def get(self, name):
+               builder = await self.backend.builders.get_by_name(name)
                if not builder:
                        raise tornado.web.HTTPError(404, "Builder not found")
 
@@ -138,13 +138,13 @@ class EditHandler(base.BaseHandler):
                if not builder.has_perm(current_user):
                        raise tornado.web.HTTPError(403)
 
-               self.render("builders/edit.html", builder=builder)
+               await self.render("builders/edit.html", builder=builder)
 
        @base.authenticated
-       async def post(self, hostname):
-               builder = self.backend.builders.get_by_name(hostname)
+       async def post(self, name):
+               builder = await self.backend.builders.get_by_name(name)
                if not builder:
-                       raise tornado.web.HTTPError(404, "Builder not found: %s" % hostname)
+                       raise tornado.web.HTTPError(404, "Builder not found: %s" % name)
 
                # Fetch the current user
                current_user = await self.get_current_user()
@@ -161,7 +161,7 @@ class EditHandler(base.BaseHandler):
                # Try to dispatch more jobs
                await self.backend.jobs.queue.dispatch()
 
-               self.redirect("/builders/%s" % builder.hostname)
+               self.redirect("/builders/%s" % builder.name)
 
 
 class DeleteHandler(base.BaseHandler):