From d54b3df61f97841d409ea23e8ae2f4b70b166692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Tue, 12 May 2020 18:23:21 +0200
Subject: [PATCH] Show user links (if available)
Show links to external user profiles in AK list and detail view
Make AK name a link to its detail page in AK list
---
AKSubmission/templates/AKSubmission/ak_detail.html | 4 +++-
AKSubmission/templates/AKSubmission/ak_list_table.html | 7 +++++--
AKSubmission/templates/AKSubmission/owners_list.html | 1 +
3 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 AKSubmission/templates/AKSubmission/owners_list.html
diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html
index 988250e6..5d2dceb4 100644
--- a/AKSubmission/templates/AKSubmission/ak_detail.html
+++ b/AKSubmission/templates/AKSubmission/ak_detail.html
@@ -54,7 +54,9 @@
<table class="table table-borderless">
<tr>
<td>{% trans "Who?" %}</td>
- <td>{{ ak.owners_list }}</td>
+ <td>
+ {% include "AKSubmission/owners_list.html" with owners=ak.owners %}
+ </td>
</tr>
<tr>
<td>{% trans 'Category' %}</td>
diff --git a/AKSubmission/templates/AKSubmission/ak_list_table.html b/AKSubmission/templates/AKSubmission/ak_list_table.html
index aeaf098c..0f227396 100644
--- a/AKSubmission/templates/AKSubmission/ak_list_table.html
+++ b/AKSubmission/templates/AKSubmission/ak_list_table.html
@@ -17,7 +17,10 @@
{% for ak in AKs %}
<tr>
<td>
- <b>{{ ak.name }}</b>
+ <a href="{% url 'submit:ak_detail' event_slug=ak.event.slug pk=ak.pk %}"
+ class="text-dark text-decoration-none font-weight-bold">
+ {{ ak.name }}
+ </a>
{% if ak.present %}
<span class="badge badge-dark badge-pill"
title="{% trans 'present this AK' %}">{% fa5_icon "bullhorn" 'fas' %}</span>
@@ -31,7 +34,7 @@
{% if ak.wish %}
<span class="badge badge-dark badge-pill">{% trans "AK Wish" %}</span>
{% else %}
- {{ ak.owners_list }}
+ {% include "AKSubmission/owners_list.html" with owners=ak.owners %}
{% endif %}
</td>
<td>{% category_linked_badge ak.category event.slug %}</td>
diff --git a/AKSubmission/templates/AKSubmission/owners_list.html b/AKSubmission/templates/AKSubmission/owners_list.html
new file mode 100644
index 00000000..21c36d20
--- /dev/null
+++ b/AKSubmission/templates/AKSubmission/owners_list.html
@@ -0,0 +1 @@
+{% for owner in owners.all %}{% if not forloop.first %}, {% endif %}{% if owner.link %}<a href="{{ owner.link }}">{{ owner }}</a>{% else %}{{ owner }}{% endif %}{% endfor %}
--
GitLab