From: Michael Tremer Date: Wed, 22 Jun 2022 08:54:28 +0000 (+0000) Subject: web: Drop changelogs X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=194c8bf355a38f068dc614d3c00ac36e61bd16a0;p=pbs.git web: Drop changelogs Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 4a3cde79..ecddd56d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -285,12 +285,6 @@ dist_templates_modules_DATA = \ templates_modulesdir = $(templatesdir)/modules -dist_templates_modules_changelog_DATA = \ - src/templates/modules/changelog/entry.html \ - src/templates/modules/changelog/index.html - -templates_modules_changelogdir = $(templates_modulesdir)/changelog - dist_templates_modules_jobs_DATA = \ src/templates/modules/jobs/list.html \ src/templates/modules/jobs/status.html @@ -309,7 +303,6 @@ dist_templates_modules_select_DATA = \ templates_modules_selectdir = $(templates_modulesdir)/select dist_templates_packages_DATA = \ - src/templates/packages/changelog.html \ src/templates/packages/index.html \ src/templates/packages/view-file.html diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py index 14f23b1f..112e0630 100644 --- a/src/buildservice/builds.py +++ b/src/buildservice/builds.py @@ -231,29 +231,6 @@ class Builds(base.Object): return build - def get_changelog(self, name, limit=5, offset=0): - query = "SELECT builds.* FROM builds \ - JOIN packages ON builds.pkg_id = packages.id \ - WHERE \ - builds.type = %s \ - AND \ - packages.name = %s" - args = ["release", name,] - - query += " ORDER BY builds.time_created DESC" - - query += " LIMIT %s OFFSET %s" - args += [offset, limit] - - builds = [] - for b in self.db.query(query, *args): - b = Build(self.backend, b.id, b) - builds.append(b) - - builds.sort(reverse=True) - - return builds - def get_comments(self, limit=10, offset=None, user=None): query = "SELECT * FROM builds_comments \ JOIN users ON builds_comments.user_id = users.id" diff --git a/src/templates/modules/changelog/entry.html b/src/templates/modules/changelog/entry.html deleted file mode 100644 index 08e4a495..00000000 --- a/src/templates/modules/changelog/entry.html +++ /dev/null @@ -1,79 +0,0 @@ -
- {% if build.type == "release" and build.repo %} - {% if build.repo.type == "stable" %} -
- - {{ build.repo.distro.name }} ‐ {{ build.repo.name }} - -
- {% elif build.repo.type == "unstable" %} -
- - {{ build.repo.distro.name }} ‐ {{ build.repo.name }} - -
- {% elif build.repo.type == "testing" %} -
- - {{ build.repo.distro.name }} ‐ {{ build.repo.name }} - -
- {% end %} - {% elif build.type == "scratch" %} -
- {{ _("Scratch build") }} -
- {% end %} - -
-

- - {% if build.is_broken() %} - {{ build.name }} - {% else %} - {{ build.name }} - {% end %} - -

- -
- - {% if build.type == "release" %} - {% if build.commit %} - {% module CommitMessage(build.commit) %} - -
- -

- {{ _("Author") }} {% module LinkToUser(build.commit.author) %} -

- {% else %} -

- {{ _("No commit message.") }} -

- {% end %} - - {% elif build.type == "scratch" %} -

- {{ _("Owner") }} {% module LinkToUser(build.owner) %} -

- {% end %} -
-
- {{ locale.format_date(build.created, shorter=True) }} -
- -
diff --git a/src/templates/modules/changelog/index.html b/src/templates/modules/changelog/index.html deleted file mode 100644 index 24183727..00000000 --- a/src/templates/modules/changelog/index.html +++ /dev/null @@ -1,4 +0,0 @@ -{% for b in builds %} - {% module ChangelogEntry(b) %} -{% end %} - diff --git a/src/templates/package-detail-list.html b/src/templates/package-detail-list.html index f131f752..b20ecde3 100644 --- a/src/templates/package-detail-list.html +++ b/src/templates/package-detail-list.html @@ -79,16 +79,6 @@ {% end %} {% end %} -
-
- {% module Changelog(builds=builds) %} - -
- {{ _("Full changelog") }} -
-
-
- {% if bugs %}
diff --git a/src/templates/packages/changelog.html b/src/templates/packages/changelog.html deleted file mode 100644 index de050131..00000000 --- a/src/templates/packages/changelog.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ _("Changelog of %s") % name }}{% end block %} - -{% block body %} -
-
- -
-
- -
-
-

- {{ name }} -
- {{ _("Changelog") }} -

-
-
-
-
- {% module Changelog(builds=builds) %} -
-
- -
-
- -
-
-{% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 0469aab4..05964ac7 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -51,10 +51,6 @@ class Application(tornado.web.Application): "BuildOffset" : ui_modules.BuildOffsetModule, "BuildTable" : ui_modules.BuildTableModule, - # Changelog - "Changelog" : ui_modules.ChangelogModule, - "ChangelogEntry" : ui_modules.ChangelogEntryModule, - # Jobs "JobsList" : ui_modules.JobsListModule, "JobsStatus" : ui_modules.JobsStatusModule, @@ -122,7 +118,6 @@ class Application(tornado.web.Application): (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\-\+]+)/changelog", packages.PackageChangelogHandler), (r"/package/([\w\-\+]+)/properties", packages.PackagePropertiesHandler), # Files diff --git a/src/web/packages.py b/src/web/packages.py index 38a1bdfc..f9c89de1 100644 --- a/src/web/packages.py +++ b/src/web/packages.py @@ -71,42 +71,6 @@ class PackageScratchBuildsHandler(base.BaseHandler): pkg=latest_build.pkg) -class PackageChangelogHandler(base.BaseHandler): - def get(self, name): - limit = self.get_argument("limit", 10) - try: - limit = int(limit) - - except ValueError: - limit = 10 - - offset = self.get_argument("offset", 0) - try: - offset = int(offset) - except ValueError: - offset = 0 - - # Get one more build than requested to find out if there are more items - # to display (next button). - builds = self.backend.builds.get_changelog(name, limit=limit + 1, offset=offset) - - if len(builds) >= limit: - have_next = True - else: - have_next = False - - if offset < limit: - have_prev = False - else: - have_prev = True - - # Clip list to limit. - builds = builds[:limit] - - self.render("packages/changelog.html", name=name, builds=builds, - limit=limit, offset=offset, have_prev=have_prev, have_next=have_next) - - class PackageDetailHandler(base.BaseHandler): def get(self, uuid): pkg = self.backend.packages.get_by_uuid(uuid) diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py index 7f1d6265..f372d650 100644 --- a/src/web/ui_modules.py +++ b/src/web/ui_modules.py @@ -81,19 +81,6 @@ class BugsTableModule(UIModule): pkg=pkg, bugs=bugs) -class ChangelogModule(UIModule): - def render(self, name=None, builds=None, *args, **kwargs): - if not builds: - builds = self.backend.builds.get_changelog(name, *args, **kwargs) - - return self.render_string("modules/changelog/index.html", builds=builds) - - -class ChangelogEntryModule(UIModule): - def render(self, build): - return self.render_string("modules/changelog/entry.html", build=build) - - class CommitsTableModule(UIModule): def render(self, distro, source, commits, full_format=True): return self.render_string("modules/commits-table.html",