From 1ca1e588c96036f6a060df94f59db7a9dc79c61a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 13 Jan 2018 13:14:52 +0000 Subject: [PATCH] Fix URL schema for builders Signed-off-by: Michael Tremer --- src/templates/builders/delete.html | 8 ++++---- src/templates/builders/detail.html | 12 ++++++------ src/templates/builders/edit.html | 6 +++--- src/templates/builders/list.html | 4 ++-- src/templates/builders/new.html | 2 +- src/templates/builders/pass.html | 6 +++--- src/templates/file-detail.html | 2 +- src/templates/jobs-abort.html | 2 +- src/templates/jobs-detail.html | 2 +- src/templates/modules/jobs-table.html | 2 +- src/templates/modules/jobs/boxes.html | 2 +- src/templates/modules/jobs/list.html | 2 +- src/templates/package-detail.html | 2 +- src/templates/uploads-list.html | 2 +- src/web/__init__.py | 15 ++++++++------- src/web/builders.py | 11 ++++++++--- 16 files changed, 43 insertions(+), 37 deletions(-) diff --git a/src/templates/builders/delete.html b/src/templates/builders/delete.html index 7cc8340..c62a417 100644 --- a/src/templates/builders/delete.html +++ b/src/templates/builders/delete.html @@ -9,9 +9,9 @@
  1. {{ _("Home") }}
  2. {{ _("Builders") }}
    3. -
  3. {{ builder.name }}
    4. +
  4. {{ builder.name }}
  5. - {{ _("Delete") }} + {{ _("Delete") }}
@@ -35,12 +35,12 @@
diff --git a/src/templates/builders/detail.html b/src/templates/builders/detail.html index ea6dd8a..bbc5c2e 100644 --- a/src/templates/builders/detail.html +++ b/src/templates/builders/detail.html @@ -10,7 +10,7 @@
  • {{ _("Home") }}
  • {{ _("Builders") }}
  • - {{ builder.name }} + {{ builder.name }}
    • @@ -34,25 +34,25 @@ {% if current_user and current_user.has_perm("maintain_builders") %}
    {% if builder.enabled %} - + {{ _("Disable builder") }} {% else %} - + {{ _("Enable builder") }} {% end %} - + {{ _("Edit builder") }} {% if not builder.enabled %} - + {{ _("Renew passphrase") }} {% end %} - + {{ _("Delete builder") }} diff --git a/src/templates/builders/edit.html b/src/templates/builders/edit.html index fcf9781..aabc526 100644 --- a/src/templates/builders/edit.html +++ b/src/templates/builders/edit.html @@ -9,9 +9,9 @@
    1. {{ _("Home") }}
    2. {{ _("Builders") }}
      3. -
    3. {{ builder.name }}
      4. +
    4. {{ builder.name }}
    5. - {{ _("Manage") }} + {{ _("Manage") }}
    @@ -76,7 +76,7 @@ - {{ _("Cancel") }} + {{ _("Cancel") }} diff --git a/src/templates/builders/list.html b/src/templates/builders/list.html index f3a9a76..1458a5a 100644 --- a/src/templates/builders/list.html +++ b/src/templates/builders/list.html @@ -24,7 +24,7 @@ {{ _("Actions") }}
    - {{ _("Create new builder") }} + {{ _("Create new builder") }}
    {% end %} @@ -55,7 +55,7 @@ {% end %} - {{ builder.name }} + {{ builder.name }}
    {{ 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 ac9c048..b40b1e9 100644 --- a/src/templates/builders/new.html +++ b/src/templates/builders/new.html @@ -10,7 +10,7 @@
  • {{ _("Home") }}
  • {{ _("Builders") }}
  • - {{ _("Create new builder") }} + {{ _("Create new builder") }}
    • diff --git a/src/templates/builders/pass.html b/src/templates/builders/pass.html index d905ef9..45c5623 100644 --- a/src/templates/builders/pass.html +++ b/src/templates/builders/pass.html @@ -7,9 +7,9 @@
    1. {{ _("Home") }}
    2. {{ _("Builders") }}
      3. -
    3. {{ builder.name }}
      4. +
    4. {{ builder.name }}
    5. - {{ _("Manage") }} + {{ _("Manage") }}
    @@ -44,7 +44,7 @@
    - {{ _("Next") }} + {{ _("Next") }}
    {% end block %} diff --git a/src/templates/file-detail.html b/src/templates/file-detail.html index 9f90ca6..b5a2524 100644 --- a/src/templates/file-detail.html +++ b/src/templates/file-detail.html @@ -98,7 +98,7 @@ {{ _("Host") }} - {{ file.build_host }} + {{ file.build_host }} diff --git a/src/templates/jobs-abort.html b/src/templates/jobs-abort.html index d662b04..a915f50 100644 --- a/src/templates/jobs-abort.html +++ b/src/templates/jobs-abort.html @@ -37,7 +37,7 @@ {{ _("Build server") }} - {{ job.builder.name }} + {{ job.builder.name }}   diff --git a/src/templates/jobs-detail.html b/src/templates/jobs-detail.html index 05c084c..2f15cdd 100644 --- a/src/templates/jobs-detail.html +++ b/src/templates/jobs-detail.html @@ -137,7 +137,7 @@ {% if job.builder %} - {{ job.builder.name }} + {{ job.builder.name }} {% else %} {{ _("No builder assigned.") }} {% end %} diff --git a/src/templates/modules/jobs-table.html b/src/templates/modules/jobs-table.html index 5b5069a..4414872 100644 --- a/src/templates/modules/jobs-table.html +++ b/src/templates/modules/jobs-table.html @@ -38,7 +38,7 @@ {% if job.builder %} - {{ job.builder.name }} + {{ job.builder.name }} {% else %} {{ _("N/A") }} {% end %} diff --git a/src/templates/modules/jobs/boxes.html b/src/templates/modules/jobs/boxes.html index 05754bb..bced2a2 100644 --- a/src/templates/modules/jobs/boxes.html +++ b/src/templates/modules/jobs/boxes.html @@ -9,7 +9,7 @@

    {{ _("Time") }}: {{ format_time(j.duration, shorter=True) }}
    {% if j.builder %} - {{ _("Builder") }}: {{ j.builder.name }} + {{ _("Builder") }}: {{ j.builder.name }} {% end %}

    diff --git a/src/templates/modules/jobs/list.html b/src/templates/modules/jobs/list.html index 7ee73e8..0ed2630 100644 --- a/src/templates/modules/jobs/list.html +++ b/src/templates/modules/jobs/list.html @@ -42,7 +42,7 @@ {% if job.builder %} - + {{ job.builder.name }} {% else %} diff --git a/src/templates/package-detail.html b/src/templates/package-detail.html index 818ce1c..2fd1498 100644 --- a/src/templates/package-detail.html +++ b/src/templates/package-detail.html @@ -110,7 +110,7 @@ {{ _("Build host") }} - {{ pkg.build_host }} + {{ pkg.build_host }} diff --git a/src/templates/uploads-list.html b/src/templates/uploads-list.html index f0c1bf2..07de20e 100644 --- a/src/templates/uploads-list.html +++ b/src/templates/uploads-list.html @@ -33,7 +33,7 @@ {{ upload.filename }} {% if upload.builder %} - + {{ upload.builder.name }} {% elif upload.user %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 0bfabcb..a02f021 100644 --- 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 1722862..94c7d43 100644 --- 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) -- 2.39.2