From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 12 May 2023 22:07:07 +0000 (+0000)
Subject: builds: Add a watchers module to show all watchers
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d542b33c0ee619169bb2df10c1e7bec39e95cffa;p=pbs.git

builds: Add a watchers module to show all watchers

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

diff --git a/Makefile.am b/Makefile.am
index 4a5bea45..0a43f456 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -202,7 +202,8 @@ dist_templates_builds_messages_DATA = \
 templates_builds_messagesdir = $(templates_buildsdir)/messages
 
 dist_templates_builds_modules_DATA = \
-	src/templates/builds/modules/list.html
+	src/templates/builds/modules/list.html \
+	src/templates/builds/modules/watchers.html
 
 templates_builds_modulesdir = $(templates_buildsdir)/modules
 
diff --git a/src/templates/builds/modules/watchers.html b/src/templates/builds/modules/watchers.html
new file mode 100644
index 00000000..29eae193
--- /dev/null
+++ b/src/templates/builds/modules/watchers.html
@@ -0,0 +1,66 @@
+<div class="block">
+	<div class="level">
+		<div class="level-left">
+			{# Watch/Unwatch #}
+			<div class="level-item">
+				<div class="buttons are-small">
+					{% if current_user in watchers %}
+						<form method="POST" action="/builds/{{ build.uuid }}/unwatch">
+							{% raw xsrf_form_html() %}
+
+							<button class="button is-primary is-outlined">
+								<span class="icon is-small">
+									<i class="fa-solid fa-eye"></i>
+								</span>
+
+								<span>
+									{% if len(watchers) == 1 %}
+										{{ _("You are watching this build") }}
+									{% else %}
+										{{ _("You and one other are watching this build",
+											"You and %(num)s others are watching this build",
+											len(watchers)) % { "num" : len(watchers) }
+										}}
+									{% end %}
+								</span>
+							</button>
+						</form>
+					{% else %}
+						<form method="POST" action="/builds/{{ build.uuid }}/watch">
+							{% raw xsrf_form_html() %}
+
+							<button class="button is-primary">
+								<span class="icon is-small">
+									<i class="fa-regular fa-eye"></i>
+								</span>
+
+								<span>
+									{% if watchers %}
+										{{ _("One person is watching this build",
+											"%(num)s persons are watching this build",
+											len(watchers)) % { "num" : len(watchers) }
+										}}
+									{% else %}
+										{{ _("Watch this build") }}
+									{% end %}
+								</span>
+							</button>
+						</form>
+					{% end %}
+				</div>
+			</div>
+
+			{# List all watchers #}
+			{% for watcher in watchers %}
+				<a class="level-item" href="/users/{{ watcher.name }}" title="{{ watcher }}">
+					<span class="icon">
+						<figure class="image">
+							<img class="is-rounded" src="{{ watcher.avatar(32) }}"
+								alt="{{ watcher }}">
+						</figure>
+					</span>
+				</a>
+			{% end %}
+		</div>
+	</div>
+</div>
diff --git a/src/templates/builds/show.html b/src/templates/builds/show.html
index bd6aa6f0..86fbc0c4 100644
--- a/src/templates/builds/show.html
+++ b/src/templates/builds/show.html
@@ -106,50 +106,8 @@
 						{% end %}
 					</div>
 
-					{# Watch/Unwatch #}
-					{% if current_user in build.watchers %}
-						<form method="POST" action="/builds/{{ build.uuid }}/unwatch">
-							{% raw xsrf_form_html() %}
-
-							<button class="button is-primary is-outlined">
-								<span class="icon is-small">
-									<i class="fa-solid fa-eye"></i>
-								</span>
-
-								<span>
-									{% if len(build.watchers) == 1 %}
-										{{ _("You are watching this build") }}
-									{% else %}
-										{{ _("You and one other are watching this build",
-											"You and %(num)s others are watching this build",
-											len(build.watchers)) % { "num" : len(build.watchers) }
-										}}
-									{% end %}
-								</span>
-							</button>
-						</form>
-					{% else %}
-						<form method="POST" action="/builds/{{ build.uuid }}/watch">
-							{% raw xsrf_form_html() %}
-
-							<button class="button is-primary">
-								<span class="icon is-small">
-									<i class="fa-regular fa-eye"></i>
-								</span>
-
-								<span>
-									{% if build.watchers %}
-										{{ _("One person is watching this build",
-											"%(num)s persons are watching this build",
-											len(build.watchers)) % { "num" : len(build.watchers) }
-										}}
-									{% else %}
-										{{ _("Watch this build") }}
-									{% end %}
-								</span>
-							</button>
-						</form>
-					{% end %}
+					{# Watchers #}
+					{% module BuildWatchers(build) %}
 				</div>
 			</div>
 		</div>
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 9727b8e8..8c836702 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -46,6 +46,7 @@ class Application(tornado.web.Application):
 
 				# Builds
 				"BuildsList"         : builds.ListModule,
+				"BuildWatchers"      : builds.WatchersModule,
 
 				# BuildGroups
 				"BuildGroupList"     : builds.GroupListModule,
diff --git a/src/web/builds.py b/src/web/builds.py
index 8f0f027b..407608f0 100644
--- a/src/web/builds.py
+++ b/src/web/builds.py
@@ -189,3 +189,12 @@ class GroupListModule(ui_modules.UIModule):
 	def render(self, group, limit=None):
 		return self.render_string("builds/groups/modules/list.html",
 			group=group, limit=limit)
+
+
+class WatchersModule(ui_modules.UIModule):
+	def render(self, build, watchers=None):
+		if watchers is None:
+			watchers = build.watchers
+
+		return self.render_string("builds/modules/watchers.html",
+			build=build, watchers=watchers)