From: Michael Tremer Date: Thu, 13 Oct 2022 10:20:19 +0000 (+0000) Subject: events: Make using the UI module easier X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8274fed524d24380d29df66ca5af7fa7f70ef868;p=pbs.git events: Make using the UI module easier Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py index 93b0b8e2..426041ef 100644 --- a/src/buildservice/builds.py +++ b/src/buildservice/builds.py @@ -513,15 +513,6 @@ class Build(base.DataObject): def score(self): return sum((c.score for c in self.comments)) - ## Logging stuff - - @property - def events(self): - """ - Return all events around this build - """ - return self.backend.events(build=self) - ## Watchers @lazy_property diff --git a/src/templates/builds/show.html b/src/templates/builds/show.html index 4114c52a..a99551e9 100644 --- a/src/templates/builds/show.html +++ b/src/templates/builds/show.html @@ -94,5 +94,5 @@ {% module JobsList(build.jobs, show_arch_only=True, show_packages=True) %} {% end %} - {% module EventsList(build.events) %} + {% module EventsList(build=build) %} {% end block %} diff --git a/src/web/events.py b/src/web/events.py index 7b4a3088..4a3a112a 100644 --- a/src/web/events.py +++ b/src/web/events.py @@ -24,7 +24,10 @@ import tornado.web from . import ui_modules class ListModule(ui_modules.UIModule): - def render(self, events): + def render(self, *args, **kwargs): + # Fetch all events + events = self.backend.events(*args, **kwargs) + return self.render_string("events/modules/list.html", events=events)