jobs: Show owner of scratch builds

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

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 5c1094a6e7f51c9b5dbfd97eed48f468fecc25f6..c5068eb211ca7859ea5efab3828261737e92c0a6 100644 (file)
--- 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 bbe5e6a696307e1ce7edc518e9cc2b5d880aebc9..fbc28cf2ce8356c99468a1ecfa7264be8e791fe5 100644 (file)
--- a/src/templates/builds/show.html
+++ b/src/templates/builds/show.html
@@ -152,7 +152,7 @@
                        <div class="container">
                                <h5 class="title is-5">{{ _("Jobs")}}</h5>
 
-                               {{ 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 341e74c23ba53cbe81213211b08647e3f4d378f1..2d11c463cd4ef5cbf4df9c7c9972d6670f4d93fc 100644 (file)
--- 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) %}
        <article class="panel">
                {% for job in jobs %}
                        <div class="panel-block is-block">
@@ -209,6 +211,17 @@
                                                        </div>
                                                {% endif %}
 
+                                               {# Scratch Build? #}
+                                               {% if show_owner and job.build.is_scratch() %}
+                                                       <span class="level-item">
+                                                               <a class="button is-text is-small" href="{{ job.build.owner.link }}">
+                                                                       <figure class="image is-24x24">
+                                                                               {{ Avatar(job.build.owner, size=48) }}
+                                                                       </figure>
+                                                               </a>
+                                                       </span>
+                                               {% endif %}
+
                                                {# Runtime #}
                                                {% if job.has_finished() %}
                                                        <div class="level-item">