From 8abc2f602d14d82e653132d9d6d1fe24c3805959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?= <benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de> Date: Sat, 9 May 2020 19:16:18 +0200 Subject: [PATCH] Show conflicts, prerequisites & conflicts on AK detail page --- .../templates/AKSubmission/ak_detail.html | 29 +++++++++++++++++++ .../AKSubmission/ak_linked_list_inline.html | 8 +++++ 2 files changed, 37 insertions(+) create mode 100644 AKSubmission/templates/AKSubmission/ak_linked_list_inline.html diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html index 50279250..02030ffc 100644 --- a/AKSubmission/templates/AKSubmission/ak_detail.html +++ b/AKSubmission/templates/AKSubmission/ak_detail.html @@ -63,6 +63,35 @@ {{ ak.reso | bool_symbol }} </td> </tr> + {% if ak.requirements.count > 0 %} + <tr> + <td>{% trans "Requirements" %}</td> + <td> + {% for requirement in ak.requirements.all %} + {% if forloop.counter0 > 0 %} + , + {% endif %} + {{ requirement }} + {% endfor %} + </td> + </tr> + {% endif %} + {% if ak.conflicts.count > 0 %} + <tr> + <td>{% trans "Conflicting AKs" %}</td> + <td> + {% include "AKSubmission/ak_linked_list_inline.html" with aks=ak.conflicts slug=ak.event.slug %} + </td> + </tr> + {% endif %} + {% if ak.prerequisites.count > 0 %} + <tr> + <td>{% trans "Prerequisite AKs" %}</td> + <td> + {% include "AKSubmission/ak_linked_list_inline.html" with aks=ak.prerequisites slug=ak.event.slug %} + </td> + </tr> + {% endif %} </table> <p style="margin-top: 30px;margin-bottom: 30px;">{{ ak.description }}</p> diff --git a/AKSubmission/templates/AKSubmission/ak_linked_list_inline.html b/AKSubmission/templates/AKSubmission/ak_linked_list_inline.html new file mode 100644 index 00000000..f5b504f7 --- /dev/null +++ b/AKSubmission/templates/AKSubmission/ak_linked_list_inline.html @@ -0,0 +1,8 @@ +{% for ak in aks.all %} + {% if forloop.counter0 > 0 %} + , + {% endif %} + <a href="{% url 'submit:ak_detail' event_slug=slug pk=ak.pk %}">{{ ak }}</a> +{% empty %} + - +{% endfor %} -- GitLab