From 0844ad36b01db44b042997bc99bdec085cd0e172 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 13 Feb 2025 16:05:03 +0000 Subject: [PATCH] jobs: Show owner of scratch builds Signed-off-by: Michael Tremer --- src/buildservice/users.py | 6 ++++++ src/templates/builds/show.html | 2 +- src/templates/jobs/macros.html | 15 ++++++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/buildservice/users.py b/src/buildservice/users.py index 5c1094a6..c5068eb2 100644 --- a/src/buildservice/users.py +++ b/src/buildservice/users.py @@ -530,6 +530,12 @@ class User(database.Base, database.BackendMixin, database.SoftDeleteMixin): name = Column(Text, nullable=False) + # Link + + @property + def link(self): + return "/users/%s" % self.name + async def delete(self): await self._set_attribute("deleted", True) diff --git a/src/templates/builds/show.html b/src/templates/builds/show.html index bbe5e6a6..fbc28cf2 100644 --- a/src/templates/builds/show.html +++ b/src/templates/builds/show.html @@ -152,7 +152,7 @@
{{ _("Jobs")}}
- {{ JobList(build.jobs, show_arch_only=True) }} + {{ JobList(build.jobs, show_arch_only=True, show_owner=False) }} {# Bug? #} {% if build.has_failed() %} diff --git a/src/templates/jobs/macros.html b/src/templates/jobs/macros.html index 341e74c2..2d11c463 100644 --- a/src/templates/jobs/macros.html +++ b/src/templates/jobs/macros.html @@ -18,7 +18,9 @@ # # ##############################################################################} -{% macro JobList(jobs, show_arch_only=False) %} +{% from "users/macros.html" import Avatar with context %} + +{% macro JobList(jobs, show_arch_only=False, show_owner=True) %}
{% for job in jobs %}
@@ -209,6 +211,17 @@
{% endif %} + {# Scratch Build? #} + {% if show_owner and job.build.is_scratch() %} + + +
+ {{ Avatar(job.build.owner, size=48) }} +
+
+
+ {% endif %} + {# Runtime #} {% if job.has_finished() %}
-- 2.47.2