web: Drop changelogs

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

diff --git a/Makefile.am b/Makefile.am
index 4a3cde795b3a8df9cf8d1fe3fa5766a7beb9175f..ecddd56dee7c5987d28f9394b809c55b6479e5f0 100644 (file)
--- 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 14f23b1fcafacb9cf50deee13be328ba4433cc06..112e06308afa19792a71e1cdb473a4cfd2499d45 100644 (file)
--- 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 (file)
index 08e4a49..0000000
--- a/src/templates/modules/changelog/entry.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<div class="card mb-3
-               {% if build.type == "release" and build.repo %}
-                       {% if build.repo.type == "stable" %}
-                               border-success
-                       {% elif  build.repo.type == "unstable" %}
-                               border-danger
-                       {% elif build.repo.type == "testing" %}
-                               border-warning
-                       {% end %}
-               {% elif build.type == "scratch" %}
-                       border-secondary
-               {% end %}
-       "
-       style="width:100%;">
-               {% if build.type == "release" and build.repo %}
-                       {% if build.repo.type == "stable" %}
-                               <div class="card-header text-success">
-                                       <a href="/distro/{{ build.repo.distro.identifier }}/repo/{{ build.repo.name }}">
-                                               {{ build.repo.distro.name }} &dash; {{ build.repo.name }}
-                                       </a>
-                               </div>
-                       {% elif build.repo.type == "unstable" %}
-                               <div class="card-header text-danger">
-                                       <a href="/distro/{{ build.repo.distro.identifier }}/repo/{{ build.repo.name }}">
-                                               {{ build.repo.distro.name }} &dash; {{ build.repo.name }}
-                                       </a>
-                               </div>
-                       {% elif build.repo.type == "testing" %}
-                               <div class="card-header text-warning">
-                                       <a href="/distro/{{ build.repo.distro.identifier }}/repo/{{ build.repo.name }}">
-                                               {{ build.repo.distro.name }} &dash; {{ build.repo.name }}
-                                       </a>
-                               </div>
-                       {% end %}
-               {% elif build.type == "scratch" %}
-                       <div class="card-header text-secondary">
-                               {{ _("Scratch build") }}
-                       </div>
-               {% end %}
-
-               <div class="card-body">
-                       <h4 class="card-title">
-                               <a href="/build/{{ build.uuid }}">
-                                       {% if build.is_broken() %}
-                                               <s>{{ build.name }}</s>
-                                       {% else %}
-                                               {{ build.name }}
-                                       {% end %}
-                               </a>
-                       </h4>
-
-                       <hr>
-
-                       {% if build.type == "release" %}
-                               {% if build.commit %}
-                                       {% module CommitMessage(build.commit) %}
-
-                                       <hr>
-
-                                       <p class="muted">
-                                               {{ _("Author") }} {% module LinkToUser(build.commit.author) %}
-                                       </p>
-                               {% else %}
-                                       <p class="muted">
-                                               {{ _("No commit message.") }}
-                                       </p>
-                               {% end %}
-
-                       {% elif build.type == "scratch" %}
-                               <p class="muted">
-                                       {{ _("Owner") }} {% module LinkToUser(build.owner) %}
-                               </p>
-                       {% end %}
-                       </div>
-                       <div class="card-footer text-muted text-right">
-                               {{ locale.format_date(build.created, shorter=True) }}
-                       </div>
-
-</div>

diff --git a/src/templates/modules/changelog/index.html b/src/templates/modules/changelog/index.html
deleted file mode 100644 (file)
index 2418372..0000000
--- 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 f131f752ac25fa1d7d6c4fd32a0b2a5a9a7b8fbc..b20ecde30b113bf844a876369651f974475f9230 100644 (file)
--- a/src/templates/package-detail-list.html
+++ b/src/templates/package-detail-list.html
@@ -79,16 +79,6 @@
                {% end %}
        {% end %}
 
-       <div class="row">
-                       <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
-                               {% module Changelog(builds=builds) %}
-
-                               <h5 class="text-center">
-                                       <a href="/package/{{ name }}/changelog">{{ _("Full changelog") }}</a>
-                               </h5>
-                       </div>
-       </div>
-
        {% if bugs %}
                <div class="row">
                        <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">

diff --git a/src/templates/packages/changelog.html b/src/templates/packages/changelog.html
deleted file mode 100644 (file)
index de05013..0000000
--- 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 %}
-       <div class="row">
-               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
-                       <nav aria-label="breadcrumb" role="navigation">
-                               <ol class="breadcrumb">
-                                       <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
-                                       <li class="breadcrumb-item"><a href="/packages">{{ _("Packages") }}</a></li>
-                                       <li class="breadcrumb-item"><a href="/package/{{ name }}">{{ name }}</a></li>
-                                       <li class="breadcrumb-item active">     <a href="/package/{{ name }}/changelog">{{ _("Changelog") }}</a></li>
-                               </ol>
-                       </nav>
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
-                       <h2 style="word-wrap: break-word;">
-                               {{ name }}
-                               <br>
-                               <small>{{ _("Changelog") }}</small>
-                       </h2>
-               </div>
-       </div>
-       <div class="row">
-               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
-                       {% module Changelog(builds=builds) %}
-               </div>
-       </div>
-
-       <div class="row">
-               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
-                       <nav>
-                               <ul class="pagination justify-content-center">
-                                       {% if have_prev %}
-                                               <li class="page-item">
-                                                       <a class="page-link" href="?offset={{ offset - limit }}&limit={{ limit }}">&larr; {{ _("Newer") }}</a>
-                                               </li>
-                                       {% else %}
-                                               <li class="page-item disabled">
-                                                       <a class="page-link" href="#">&larr; {{ _("Newer") }}</a>
-                                               </li>
-                                       {% end %}
-                                       {% if have_next %}
-                                               <li class="page-item">
-                                                       <a class="page-link" href="?offset={{ offset + limit }}&limit={{ limit }}">{{ _("Older") }} &rarr;</a>
-                                               </li>
-                                       {% else %}
-                                               <li class="page-item disabled">
-                                                       <a class="page-link" href="#">{{ _("Older") }} &rarr;</a>
-                                               </li>
-                                       {% end %}
-                               </ul>
-                       </nav>
-               </div>
-       </div>
-{% end block %}

diff --git a/src/web/__init__.py b/src/web/__init__.py
index 0469aab4875e0d72a809160c8c2da0ece9dfe0a4..05964ac7c2a58ae645dc9ccb5f9786feb44eb517 100644 (file)
--- 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 38a1bdfc07e96e3d5fcd7656e1d3bf9bf398cecd..f9c89de14445ac7b3a562f49e3334cb611633a02 100644 (file)
--- 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 7f1d62655a2d60f11528df56628c1681e2bd9218..f372d65048c5b07f2cf4d36a752d8524555d43e3 100644 (file)
--- 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",