From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 29 Apr 2023 12:08:33 +0000 (+0000)
Subject: builders: Add log to detail page
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d27d670e2c69dffcfa7d979f3c115027d6a757f2;p=pbs.git

builders: Add log to detail page

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

diff --git a/src/templates/builders/detail.html b/src/templates/builders/detail.html
index 29926877..3cdfbe45 100644
--- a/src/templates/builders/detail.html
+++ b/src/templates/builders/detail.html
@@ -104,4 +104,10 @@
 			{% module JobsList(builder.jobs) %}
 		</div>
 	{% end %}
+
+	<div class="block">
+		<h5 class="title is-5">{{ _("Log") }}</h5>
+
+		{% module EventsList(builder=builder, show_builder=False, limit=10) %}
+	</div>
 {% end block %}
diff --git a/src/templates/events/modules/list.html b/src/templates/events/modules/list.html
index ff7ed9e2..7845c48b 100644
--- a/src/templates/events/modules/list.html
+++ b/src/templates/events/modules/list.html
@@ -4,6 +4,6 @@
 	{% elif event.user or event.by_user %}
 		{% module EventUserMessage(event, show_build=show_build) %}
 	{% else %}
-		{% module EventSystemMessage(event, show_build=show_build) %}
+		{% module EventSystemMessage(event, show_build=show_build, show_builder=show_builder) %}
 	{% end %}
 {% end %}
diff --git a/src/templates/events/modules/system-message.html b/src/templates/events/modules/system-message.html
index b8caf89a..9a3a55e1 100644
--- a/src/templates/events/modules/system-message.html
+++ b/src/templates/events/modules/system-message.html
@@ -94,7 +94,7 @@
 				{% end %}
 
 				{# Builder #}
-				{% if event.builder %}
+				{% if show_builder and event.builder %}
 					<a class="level-item" href="/builders/{{ event.builder.hostname }}">
 						{{ event.builder }}
 					</a>
diff --git a/src/web/events.py b/src/web/events.py
index 43c42cfa..6fd60825 100644
--- a/src/web/events.py
+++ b/src/web/events.py
@@ -24,12 +24,12 @@ import tornado.web
 from . import ui_modules
 
 class ListModule(ui_modules.UIModule):
-	def render(self, *args, show_build=True, **kwargs):
+	def render(self, *args, show_build=True, show_builder=True, **kwargs):
 		# Fetch all events
 		events = self.backend.events(*args, **kwargs)
 
 		return self.render_string("events/modules/list.html",
-			events=events, show_build=show_build)
+			events=events, show_build=show_build, show_builder=show_builder)
 
 
 class BuildCommentModule(ui_modules.UIModule):
@@ -45,6 +45,6 @@ class UserMessageModule(ui_modules.UIModule):
 
 
 class SystemMessageModule(ui_modules.UIModule):
-	def render(self, event, show_build=True):
+	def render(self, event, show_build=True, show_builder=True):
 		return self.render_string("events/modules/system-message.html",
-			event=event, show_build=show_build)
+			event=event, show_build=show_build, show_builder=show_builder)