packages: Move name handler to the right place

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

diff --git a/Makefile.am b/Makefile.am
index 61dc34d3885dc3fc409b4862b871b5b2b2a4f263..b1b8a1e44cc7a6963e1d0e3f89f1508ad1e14c78 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,7 +172,6 @@ dist_templates_DATA = \
        src/templates/log.html \
        src/templates/login.html \
        src/templates/package-detail.html \
-       src/templates/package-detail-list.html \
        src/templates/package-properties.html \
        src/templates/queue.html \
        src/templates/search.html \
@@ -323,6 +322,7 @@ templates_repos_modulesdir = $(templates_reposdir)/modules
 
 dist_templates_packages_DATA = \
        src/templates/packages/index.html \
+       src/templates/packages/name.html \
        src/templates/packages/view-file.html
 
 templates_packagesdir = $(templatesdir)/packages

diff --git a/src/templates/package-detail-list.html b/src/templates/packages/name.html
similarity index 98%
rename from src/templates/package-detail-list.html
rename to src/templates/packages/name.html
index ee7be16618accecaca2b942c911b65de7139c521..eee0cea401d3483b62b1b0ff789226bc92e8019a 100644 (file)
--- a/src/templates/package-detail-list.html
+++ b/src/templates/packages/name.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ _("Package") }} - {{ package.name }}{% end block %}
 

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 8199b63c07317b7033bae56e72450bd37df48de7..da2026e7252f5a67a6706f80fcfc3dcbf2827695 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -129,10 +129,10 @@ class Application(tornado.web.Application):
 
                        # Packages
                        (r"/packages", packages.IndexHandler),
+                       (r"/packages/([\w\-\+]+)", packages.NameHandler),
                        (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", packages.PackageDetailHandler),
                        (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/download(.*)", packages.PackageFileDownloadHandler),
                        (r"/package/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})/view(.*)", packages.PackageFileViewHandler),
-                       (r"/packages/([\w\-\+]+)", packages.PackageNameHandler),
                        (r"/package/([\w\-\+]+)/builds/scratch", packages.PackageScratchBuildsHandler),
                        (r"/package/([\w\-\+]+)/properties", packages.PackagePropertiesHandler),
 

diff --git a/src/web/packages.py b/src/web/packages.py
index 0d2109a36e80236495a1f12516416cd241ef32f8..d04c242b1bb451335d1dfa53bb5d948d24a0aec7 100644 (file)
--- a/src/web/packages.py
+++ b/src/web/packages.py
@@ -25,16 +25,7 @@ class IndexHandler(base.BaseHandler):
                self.render("packages/index.html", packages=packages)
 
 
-class PackageIDDetailHandler(base.BaseHandler):
-       def get(self, id):
-               package = self.packages.get_by_id(id)
-               if not package:
-                       return tornado.web.HTTPError(404, "Package not found: %s" % id)
-
-               self.render("package-detail.html", package=package)
-
-
-class PackageNameHandler(base.BaseHandler):
+class NameHandler(base.BaseHandler):
        async def get(self, name):
                build = self.backend.builds.get_latest_by_name(name)
                if not build:
@@ -43,7 +34,16 @@ class PackageNameHandler(base.BaseHandler):
                # Get the latest bugs from Bugzilla
                bugs = await self.backend.bugzilla.search(component=name, resolution="")
 
-               self.render("package-detail-list.html", package=build.pkg, bugs=bugs)
+               self.render("packages/name.html", package=build.pkg, bugs=bugs)
+
+
+class PackageIDDetailHandler(base.BaseHandler):
+       def get(self, id):
+               package = self.packages.get_by_id(id)
+               if not package:
+                       return tornado.web.HTTPError(404, "Package not found: %s" % id)
+
+               self.render("package-detail.html", package=package)
 
 
 class PackageScratchBuildsHandler(base.BaseHandler):