From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 22 Jun 2022 09:03:50 +0000 (+0000)
Subject: builds: Rename detail handler
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7bc5fb174dd1668e7866b2fd5c6f95b20404e45;p=pbs.git

builds: Rename detail handler

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

diff --git a/Makefile.am b/Makefile.am
index ecddd56d..f4bd8571 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,6 @@ dist_templates_DATA = \
 	src/templates/base.html \
 	src/templates/build-bugs.html \
 	src/templates/build-delete.html \
-	src/templates/build-detail.html \
 	src/templates/build-filter.html \
 	src/templates/build-index.html \
 	src/templates/build-list.html \
@@ -209,7 +208,8 @@ dist_templates_builders_DATA = \
 templates_buildersdir = $(templatesdir)/builders
 
 dist_templates_builds_DATA = \
-	src/templates/builds/comments.html
+	src/templates/builds/comments.html \
+	src/templates/builds/show.html
 
 templates_buildsdir = $(templatesdir)/builds
 
diff --git a/src/templates/build-detail.html b/src/templates/builds/show.html
similarity index 99%
rename from src/templates/build-detail.html
rename to src/templates/builds/show.html
index a85e3878..f9db497b 100644
--- a/src/templates/build-detail.html
+++ b/src/templates/builds/show.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Build") }}: {{ build }}{% end block %}
 
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 05964ac7..02f65f66 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -127,7 +127,7 @@ class Application(tornado.web.Application):
 			(r"/builds", builds.BuildsHandler),
 			(r"/builds/comments", builds.BuildsCommentsHandler),
 			(r"/builds/comments/(\w+)", builds.BuildsCommentsHandler),
-			(r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", builds.BuildDetailHandler),
+			(r"/builds/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", builds.ShowHandler),
 			(r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/bugs", builds.BuildBugsHandler),
 			(r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/manage", builds.BuildManageHandler),
 			(r"/build/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/comment", builds.BuildDetailCommentHandler),
diff --git a/src/web/builds.py b/src/web/builds.py
index efcf2843..a6daa253 100644
--- a/src/web/builds.py
+++ b/src/web/builds.py
@@ -32,9 +32,11 @@ class BuildBaseHandler(base.BaseHandler):
 		return build
 
 
-class BuildDetailHandler(BuildBaseHandler):
+class ShowHandler(BuildBaseHandler):
 	def get(self, uuid):
-		build = self.get_build(uuid)
+		build = self.backend.builds.get_by_uuid(uuid)
+		if not build:
+			raise tornado.web.HTTPError(404, "Could not find build %s" % uuid)
 
 		# Cache the log.
 		log = build.get_log()
@@ -42,7 +44,7 @@ class BuildDetailHandler(BuildBaseHandler):
 		# Bugs.
 		bugs = build.get_bugs()
 
-		self.render("build-detail.html", build=build, log=log, pkg=build.pkg,
+		self.render("builds/show.html", build=build, log=log, pkg=build.pkg,
 			distro=build.distro, bugs=bugs, repo=build.repo)