events: Make using the UI module easier

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

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 93b0b8e28b9ac3e205761d704e0c6ffa6d6f7823..426041ef84ff9b7a5e646148bc8f398028c9e87c 100644 (file)
--- 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 4114c52aeb2e1d8b39049159931e158aa322ea20..a99551e90dc376906fd3db9c73a50da5f910983b 100644 (file)
--- 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 7b4a3088947318f3e13a2883da6d34923b26b895..4a3a112ac88199bffbe0362c6cf31e72e707d5f8 100644 (file)
--- 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)