From: Michael Tremer Date: Wed, 22 Jun 2022 10:42:31 +0000 (+0000) Subject: web: Drop comments pages X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=139cfca70edfcdd7979f6226dd175f04ee795472;p=pbs.git web: Drop comments pages Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index 829512bf..1d30fcb3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -207,7 +207,6 @@ dist_templates_builders_DATA = \ templates_buildersdir = $(templatesdir)/builders dist_templates_builds_DATA = \ - src/templates/builds/comments.html \ src/templates/builds/index.html \ src/templates/builds/show.html @@ -260,7 +259,6 @@ dist_templates_modules_DATA = \ src/templates/modules/build-offset.html \ src/templates/modules/build-state-warnings.html \ src/templates/modules/build-table.html \ - src/templates/modules/comments-table.html \ src/templates/modules/commits-table.html \ src/templates/modules/commit-message.html \ src/templates/modules/files-table.html \ diff --git a/src/templates/builds/comments.html b/src/templates/builds/comments.html deleted file mode 100644 index fc9e72fc..00000000 --- a/src/templates/builds/comments.html +++ /dev/null @@ -1,84 +0,0 @@ -{% extends "../base.html" %} - -{% block title %}{{ _("Build comments") }}{% end block %} - -{% block body %} - - - {% if user %} - - {% end %} - -
- {% if user %} -

{{ _("%s's latest comments") % user.firstname }}

- {% else %} -

{{ _("Build comments") }}

- {% end %} -
- - {% if comments %} -

- {% if user %} - {{ _("This page shows %s's latest comments.") % user.firstname }} - {% else %} - {{ _("This page shows the latest comments on builds.") }} - {% end %} - {{ _("The Pakfire Build Service is all about social development and so, communicating with eath others is important. Please join.") }} -

- - {% module Log(comments, show_build=True) %} - - - {% elif not comments and user %} -

- {{ _("%s did not comment on anything, yet.") % user.firstname }} -

- {% end %} -{% end block %} diff --git a/src/templates/modules/comments-table.html b/src/templates/modules/comments-table.html deleted file mode 100644 index 0f228074..00000000 --- a/src/templates/modules/comments-table.html +++ /dev/null @@ -1,25 +0,0 @@ -
- {% if comments %} - {% for comment in comments %} -
-

{{ comment.text }}

- - {% if show_package %} - {{ _("on %s") % comment.pkg.friendly_name }} - - {% end %} - {% if show_user %} - {{ _("by %s") % comment.user.realname }} - - {% end %} - {{ locale.format_date(comment.time_created) }} - - {% if comment.time_updated %} - _("Updated") {{ locale.format_date(comment.time_updated) }} - {% end %} - -
- {% end %} - {% else %} -

{{ _("No comments so far.") }}

- {% end %} -
-
 
diff --git a/src/templates/user-profile.html b/src/templates/user-profile.html index 0bfd7191..f0ded1e5 100644 --- a/src/templates/user-profile.html +++ b/src/templates/user-profile.html @@ -32,9 +32,6 @@ {{ _("Actions") }}
- - {{ _("View comments") }} - {% if current_user == user or current_user.is_admin() %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 30cc23b4..a8c55454 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -63,7 +63,6 @@ class Application(tornado.web.Application): "CommitsTable" : ui_modules.CommitsTableModule, "JobState" : ui_modules.JobStateModule, "JobsTable" : ui_modules.JobsTableModule, - "CommentsTable" : ui_modules.CommentsTableModule, "FilesTable" : ui_modules.FilesTableModule, "LinkToUser" : ui_modules.LinkToUserModule, "LogTable" : ui_modules.LogTableModule, @@ -126,8 +125,6 @@ class Application(tornado.web.Application): # Builds (r"/builds", builds.IndexHandler), - (r"/builds/comments", builds.BuildsCommentsHandler), - (r"/builds/comments/(\w+)", builds.BuildsCommentsHandler), (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), diff --git a/src/web/builds.py b/src/web/builds.py index 91bfb46b..d8193983 100644 --- a/src/web/builds.py +++ b/src/web/builds.py @@ -120,37 +120,6 @@ class BuildBugsHandler(base.BaseHandler): self.redirect("/build/%s/bugs" % build.uuid) -class BuildsCommentsHandler(base.BaseHandler): - def get(self, user_name=None): - user = None - if user_name: - user = self.backend.users.get_by_name(user_name) - - limit = self.get_argument("limit", 10) - offset = self.get_argument("offset", 0) - - try: - limit = int(limit) - offset = int(offset) - except: - raise tornado.web.HTTPError(400) - - # Try to get one more comment than requested and check if there - # is a next page that it to be shown. - comments = self.backend.builds.get_comments(limit=limit + 1, - offset=offset, user=user) - - # Set markers for next and prev pages. - have_next = len(comments) > limit - have_prev = offset > limit - - # Remove the extra element from the list. - comments = comments[:limit] - - self.render("builds/comments.html", comments=comments, limit=limit, - offset=offset + limit, user=user, have_prev=have_prev, have_next=have_next) - - class BuildStateHandler(base.BaseHandler): def get(self, uuid): build = self.backend.builds.get_by_uuid(uuid) diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py index f372d650..a96ab7f5 100644 --- a/src/web/ui_modules.py +++ b/src/web/ui_modules.py @@ -315,32 +315,6 @@ class SourceTableModule(UIModule): distro=distro, sources=sources) -class CommentsTableModule(UIModule): - def render(self, comments, show_package=False, show_user=True): - pkgs, users = {}, {} - for comment in comments: - if show_package: - try: - pkg = pkgs[comment.pkg_id] - except KeyError: - pkg = pkgs[comment.pkg_id] = \ - self.backend.packages.get_by_id(comment.pkg_id) - - comment["pkg"] = pkg - - if show_user: - try: - user = users[comment.user_id] - except KeyError: - user = users[comment.user_id] = \ - self.backend.users.get_by_id(comment.user_id) - - comment["user"] = user - - return self.render_string("modules/comments-table.html", - comments=comments, show_package=show_package, show_user=show_user) - - class LogModule(UIModule): def render(self, entries, **args): return self.render_string("modules/log.html",