Fix URL schema for builders

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

diff --git a/src/templates/builders/delete.html b/src/templates/builders/delete.html
index 7cc83404deee88b5d18da9f21796c2714922710e..c62a41711082917d4bf301911e9a2c858315a7df 100644 (file)
--- a/src/templates/builders/delete.html
+++ b/src/templates/builders/delete.html
@@ -9,9 +9,9 @@
                                <ol class="breadcrumb">
                                        <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
                                        <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
-                                       <li class="breadcrumb-item"><a href="/builder/{{ builder.name }}">{{ builder.name }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builders/{{ builder.name }}">{{ builder.name }}</a></li>
                                        <li class="breadcrumb-item active">
-                                                       <a href="/builder/{{ builder.name }}/delete">{{ _("Delete") }}</a>
+                                                       <a href="/builders/{{ builder.name }}/delete">{{ _("Delete") }}</a>
                                        </li>
                                </ol>
                        </nav>
@@ -35,12 +35,12 @@
                <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
                        <div class="btn-toolbar" role="toolbar">
                                <div class="btn-group mr-2 mb-2" role="group">
-                                       <a class="btn btn-danger" href="/builder/{{ builder.name }}/delete?confirmed=1">
+                                       <a class="btn btn-danger" href="/builders/{{ builder.name }}/delete?confirmed=1">
                                                {{ _("Delete %s") % builder.name }}
                                        </a>
                                </div>
                                <div class="btn-group mb-2" role="group">
-                                       <a class="btn btn-primary" href="/builder/{{ builder.name }}">{{ _("Cancel") }}</a>
+                                       <a class="btn btn-primary" href="/builders/{{ builder.name }}">{{ _("Cancel") }}</a>
                                </div>
                        </div>
                </div>

diff --git a/src/templates/builders/detail.html b/src/templates/builders/detail.html
index ea6dd8aae77291e7615980604aa1d61c8375cc59..bbc5c2e14e6ee3ba2a90a9e371f84c6bc788103e 100644 (file)
--- a/src/templates/builders/detail.html
+++ b/src/templates/builders/detail.html
@@ -10,7 +10,7 @@
                                        <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
                                        <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
                                        <li class="breadcrumb-item active">
-                                                       <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
+                                                       <a href="/builders/{{ builder.name }}">{{ builder.name }}</a>
                                        </li>
                                </ol>
                        </nav>
@@ -34,25 +34,25 @@
                                        {% if current_user and current_user.has_perm("maintain_builders") %}
                                                <div class="dropdown-divider"></div>
                                                {% if builder.enabled %}
-                                                       <a class="dropdown-item" href="/builder/{{ builder.name }}/disable">
+                                                       <a class="dropdown-item" href="/builders/{{ builder.name }}/disable">
                                                                {{ _("Disable builder") }}
                                                        </a>
                                                {% else %}
-                                                       <a class="dropdown-item" href="/builder/{{ builder.name }}/enable">
+                                                       <a class="dropdown-item" href="/builders/{{ builder.name }}/enable">
                                                                {{ _("Enable builder") }}
                                                        </a>
                                                {% end %}
-                                               <a class="dropdown-item" href="/builder/{{ builder.name }}/edit">
+                                               <a class="dropdown-item" href="/builders/{{ builder.name }}/edit">
                                                        <i class="icon-edit"></i>
                                                        {{ _("Edit builder") }}
                                                </a>
                                                {% if not builder.enabled %}
-                                                       <a class="dropdown-item" href="/builder/{{ builder.name }}/renew">
+                                                       <a class="dropdown-item" href="/builders/{{ builder.name }}/renew">
                                                                <i class="icon-refresh"></i>
                                                                {{ _("Renew passphrase") }}
                                                        </a>
                                                {% end %}
-                                               <a class="dropdown-item"href="/builder/{{ builder.name }}/delete">
+                                               <a class="dropdown-item"href="/builders/{{ builder.name }}/delete">
                                                        <i class="icon-trash"></i>
                                                        {{ _("Delete builder") }}
                                                </a>

diff --git a/src/templates/builders/edit.html b/src/templates/builders/edit.html
index fcf97816e5a310c038572bfca349edb374a50530..aabc526ea9283cc474ec03e71302d2b0e4385880 100644 (file)
--- a/src/templates/builders/edit.html
+++ b/src/templates/builders/edit.html
@@ -9,9 +9,9 @@
                                <ol class="breadcrumb">
                                        <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
                                        <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
-                                       <li class="breadcrumb-item"><a href="/builder/{{ builder.name }}">{{ builder.name }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builders/{{ builder.name }}">{{ builder.name }}</a></li>
                                        <li class="breadcrumb-item active">
-                                               <a href="/builder/{{ builder.name }}/edit">{{ _("Manage") }}</a>
+                                               <a href="/builders/{{ builder.name }}/edit">{{ _("Manage") }}</a>
                                        </li>
                                </ol>
                        </nav>
@@ -76,7 +76,7 @@
                                </fieldset>
 
                                <button type="submit" class="btn btn-primary">{{ _("Save changes") }}</button>
-                               <a class="btn" href="/builder/{{ builder.name }}">{{ _("Cancel") }}</a>
+                               <a class="btn" href="/builders/{{ builder.name }}">{{ _("Cancel") }}</a>
                        </form>
                </div>
        </div>

diff --git a/src/templates/builders/list.html b/src/templates/builders/list.html
index f3a9a76b0e291efee37e8bb8a85b8205b1335a11..1458a5a118ce43ba31c73a29c49765b7b3be399c 100644 (file)
--- a/src/templates/builders/list.html
+++ b/src/templates/builders/list.html
@@ -24,7 +24,7 @@
                                        {{ _("Actions") }}
                                </button>
                                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
-                                       <a class="dropdown-item" href="/builder/new">{{ _("Create new builder") }}</a>
+                                       <a class="dropdown-item" href="/builders/new">{{ _("Create new builder") }}</a>
                                </div>
                </div>
        {% end %}
@@ -55,7 +55,7 @@
                                                                        {% end %}
                                                                </td>
                                                                <td>
-                                                                       <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
+                                                                       <a href="/builders/{{ builder.name }}">{{ builder.name }}</a>
                                                                        <br>
                                                                        {{ builder.cpu_model or _("Unknown CPU") }}
                                                                        {% if builder.mem_total %}

diff --git a/src/templates/builders/new.html b/src/templates/builders/new.html
index ac9c0485b41aab002538e62d6a1f068c001d6a8a..b40b1e944630375611a4788a2c143192c8dc0994 100644 (file)
--- a/src/templates/builders/new.html
+++ b/src/templates/builders/new.html
@@ -10,7 +10,7 @@
                                        <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
                                        <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
                                        <li class="breadcrumb-item active">
-                                               <a href="/builder/new">{{ _("Create new builder") }}</a>
+                                               <a href="/builders/new">{{ _("Create new builder") }}</a>
                                        </li>
                                </ol>
                        </nav>

diff --git a/src/templates/builders/pass.html b/src/templates/builders/pass.html
index d905ef96ddbaec907008ed006ea106fb3934f98e..45c5623d58f46124ce8d43089148d1a4a5f9d67f 100644 (file)
--- a/src/templates/builders/pass.html
+++ b/src/templates/builders/pass.html
@@ -7,9 +7,9 @@
                                <ol class="breadcrumb">
                                        <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
                                        <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
-                                       <li class="breadcrumb-item"><a href="/builder/{{ builder.name }}">{{ builder.name }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builders/{{ builder.name }}">{{ builder.name }}</a></li>
                                        <li class="breadcrumb-item active">
-                                               <a href="/builder/{{ builder.name }}/edit">{{ _("Manage") }}</a>
+                                               <a href="/builders/{{ builder.name }}/edit">{{ _("Manage") }}</a>
                                        </li>
                                </ol>
                        </nav>
@@ -44,7 +44,7 @@
 
        <div class="row justify-content-end">
                <div class="col-12 col-sm-12 col-md-3 col-lg-2 col-xl-2">
-                               <a class="btn btn-primary btn-block" href="/builder/{{ builder.name }}">{{ _("Next") }}</a>
+                               <a class="btn btn-primary btn-block" href="/builders/{{ builder.name }}">{{ _("Next") }}</a>
                </div>
        </div>
 {% end block %}

diff --git a/src/templates/file-detail.html b/src/templates/file-detail.html
index 9f90ca6c46498ec97a4ed146cb53470a4efba529..b5a25241873653e854494cb0b26f68be582e4ee3 100644 (file)
--- a/src/templates/file-detail.html
+++ b/src/templates/file-detail.html
@@ -98,7 +98,7 @@
                <tr>
                        <td class="col1">{{ _("Host") }}</td>
                        <td class="col2">
-                               <a href="/builder/{{ file.build_host }}">{{ file.build_host }}</a>
+                               <a href="/builders/{{ file.build_host }}">{{ file.build_host }}</a>
                        </td>
                </tr>
                <tr>

diff --git a/src/templates/jobs-abort.html b/src/templates/jobs-abort.html
index d662b0408df70ddfb2b0eea114e7874d2d1766f8..a915f50200e6d8715319141478eb81a12b53aea8 100644 (file)
--- a/src/templates/jobs-abort.html
+++ b/src/templates/jobs-abort.html
@@ -37,7 +37,7 @@
                        <tr>
                                <td class="col1">{{ _("Build server") }}</td>
                                <td class="col2">
-                                       <a href="/builder/{{ job.builder.name }}">{{ job.builder.name }}</a>
+                                       <a href="/builders/{{ job.builder.name }}">{{ job.builder.name }}</a>
                                </td>
                                <td class="col3">
                                        &nbsp;

diff --git a/src/templates/jobs-detail.html b/src/templates/jobs-detail.html
index 05c084cbc51372491f9bfc0eb976033379bb59f7..2f15cddbd2ff342fb38e5166e63f925ab3ad4519 100644 (file)
--- a/src/templates/jobs-detail.html
+++ b/src/templates/jobs-detail.html
@@ -137,7 +137,7 @@
                                                        </td>
                                                        <td>
                                                                {% if job.builder %}
-                                                                       <a href="/builder/{{ job.builder.name }}">{{ job.builder.name }}</a>
+                                                                       <a href="/builders/{{ job.builder.name }}">{{ job.builder.name }}</a>
                                                                {% else %}
                                                                        <span class="text-muted">{{ _("No builder assigned.") }}</span>
                                                                {% end %}

diff --git a/src/templates/modules/jobs-table.html b/src/templates/modules/jobs-table.html
index 5b5069a29f2bdf37e2b264860d14c2073c2d6402..4414872076fd95ddc17cf51eb8e890d47118d67f 100644 (file)
--- a/src/templates/modules/jobs-table.html
+++ b/src/templates/modules/jobs-table.html
@@ -38,7 +38,7 @@
                                                </td>
                                                <td>
                                                        {% if job.builder %}
-                                                               <a href="/builder/{{ job.builder.name }}">{{ job.builder.name }}</a>
+                                                               <a href="/builders/{{ job.builder.name }}">{{ job.builder.name }}</a>
                                                        {% else %}
                                                                {{ _("N/A") }}
                                                        {% end %}

diff --git a/src/templates/modules/jobs/boxes.html b/src/templates/modules/jobs/boxes.html
index 05754bb1c85af88f2c5ed4fac616df242152005c..bced2a2f16c2d75e71fa5169d759a55ab65b912f 100644 (file)
--- a/src/templates/modules/jobs/boxes.html
+++ b/src/templates/modules/jobs/boxes.html
@@ -9,7 +9,7 @@
                        <p class="card-text">
                                {{ _("Time") }}: {{ format_time(j.duration, shorter=True) }} <br>
                                {% if j.builder %}
-                                       {{ _("Builder") }}: <a href="/builder/{{ j.builder.name }}">{{ j.builder.name }}</a>
+                                       {{ _("Builder") }}: <a href="/builders/{{ j.builder.name }}">{{ j.builder.name }}</a>
                                {% end %}
                        </p>
                </div>

diff --git a/src/templates/modules/jobs/list.html b/src/templates/modules/jobs/list.html
index 7ee73e8a222bf201e353c6dd107037dd105a8320..0ed2630030ff3d14de05417e1b32101233a0e745 100644 (file)
--- a/src/templates/modules/jobs/list.html
+++ b/src/templates/modules/jobs/list.html
@@ -42,7 +42,7 @@
 
                                        <td>
                                                {% if job.builder %}
-                                                       <a href="/builder/{{ job.builder.name }}">
+                                                       <a href="/builders/{{ job.builder.name }}">
                                                                {{ job.builder.name }}
                                                        </a>
                                                {% else %}

diff --git a/src/templates/package-detail.html b/src/templates/package-detail.html
index 818ce1c7d2a8c2f3a7b83b235b234071815be28a..2fd149896f9d9eead9d195316044f449c8bf38ba 100644 (file)
--- a/src/templates/package-detail.html
+++ b/src/templates/package-detail.html
@@ -110,7 +110,7 @@
                                                <tr>
                                                        <td>{{ _("Build host") }}</td>
                                                        <td>
-                                                               <a href="/builder/{{ pkg.build_host }}">{{ pkg.build_host }}</a>
+                                                               <a href="/builders/{{ pkg.build_host }}">{{ pkg.build_host }}</a>
                                                        </td>
                                                </tr>
                                                <tr>

diff --git a/src/templates/uploads-list.html b/src/templates/uploads-list.html
index f0c1bf2f211f8824c07b394eb25f4c679b0b1a18..07de20e3b9d9be5d81a50e67b62d231b95a93268 100644 (file)
--- a/src/templates/uploads-list.html
+++ b/src/templates/uploads-list.html
@@ -33,7 +33,7 @@
                                                <td>{{ upload.filename }}</td>
                                                <td>
                                                        {% if upload.builder %}
-                                                               <a href="/builder/{{ upload.builder.name }}">
+                                                               <a href="/builders/{{ upload.builder.name }}">
                                                                        {{ upload.builder.name }}
                                                                </a>
                                                        {% elif upload.user %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 0bfabcbf1d1a8422401c4f8f71651fe026d1d2ca..a02f021eb280d06eea50cf1c1f8327edadd6f77d 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -172,13 +172,14 @@ class Application(tornado.web.Application):
 
                        # Builders
                        (r"/builders", builders.BuilderListHandler),
-                       (r"/builder/new", builders.BuilderNewHandler),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/enable", builders.BuilderEnableHander),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/disable", builders.BuilderDisableHander),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/delete", builders.BuilderDeleteHandler),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/edit", builders.BuilderEditHandler),
-                       (r"/builder/([A-Za-z0-9\-\.]+)/renew", builders.BuilderRenewPassphraseHandler),
-                       (r"/builder/([A-Za-z0-9\-\.]+)", builders.BuilderDetailHandler),
+                       (r"/builders/new", builders.BuilderNewHandler),
+                       (r"/builders/([A-Za-z0-9\-\.]+)/enable", builders.BuilderEnableHander),
+                       (r"/builders/([A-Za-z0-9\-\.]+)/disable", builders.BuilderDisableHander),
+                       (r"/builders/([A-Za-z0-9\-\.]+)/delete", builders.BuilderDeleteHandler),
+                       (r"/builders/([A-Za-z0-9\-\.]+)/edit", builders.BuilderEditHandler),
+                       (r"/builders/([A-Za-z0-9\-\.]+)/renew", builders.BuilderRenewPassphraseHandler),
+                       (r"/builders/([A-Za-z0-9\-\.]+)", builders.BuilderDetailHandler),
+                       (r"/builder/([A-Za-z0-9\-\.]+)", builders.RedirectHandler),
 
                        # Distributions
                        (r"/distros", distributions.DistributionListHandler),

diff --git a/src/web/builders.py b/src/web/builders.py
index 1722862348c494140f3f776c81173c4841269c6f..94c7d4378252703dce7b095d320b92e96b587d27 100644 (file)
--- a/src/web/builders.py
+++ b/src/web/builders.py
@@ -33,7 +33,7 @@ class BuilderDetailHandler(base.BaseHandler):
                with self.db.transaction():
                        builder.description = self.get_argument("description", None)
 
-               self.redirect("/builder/%s" % builder.hostname)
+               self.redirect("/builders/%s" % builder.hostname)
 
 
 class BuilderNewHandler(base.BaseHandler):
@@ -89,7 +89,7 @@ class BuilderEditHandler(base.BaseHandler):
                                max_jobs = 1
                        builder.max_jobs = max_jobs
 
-               self.redirect("/builder/%s" % builder.hostname)
+               self.redirect("/builders/%s" % builder.hostname)
 
 
 class BuilderRenewPassphraseHandler(base.BaseHandler):
@@ -139,7 +139,7 @@ class BuilderStatusChangeHandler(base.BaseHandler):
                        with self.db.transaction():
                                builder.enabled = self.enabled
 
-               self.redirect("/builder/%s" % builder.name)
+               self.redirect("/builders/%s" % builder.name)
 
 
 class BuilderEnableHander(BuilderStatusChangeHandler):
@@ -148,3 +148,8 @@ class BuilderEnableHander(BuilderStatusChangeHandler):
 
 class BuilderDisableHander(BuilderStatusChangeHandler):
        enabled = False
+
+
+class RedirectHandler(base.BaseHandler):
+       def get(self, hostname):
+               self.redirect("/builders/%s" % hostname, permanent=True)