From 6382963ed867275855fbb3c18800dd303892df0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Fri, 22 May 2020 14:37:40 +0200
Subject: [PATCH] Add virtual room link to AK detail page
First part of #89
Also fix #87
---
AKPlan/templates/AKPlan/plan_akslot.html | 2 +-
AKSubmission/templates/AKSubmission/ak_detail.html | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/AKPlan/templates/AKPlan/plan_akslot.html b/AKPlan/templates/AKPlan/plan_akslot.html
index 03769846..f951c86c 100644
--- a/AKPlan/templates/AKPlan/plan_akslot.html
+++ b/AKPlan/templates/AKPlan/plan_akslot.html
@@ -53,7 +53,7 @@
'title': '{{ slot.room }}',
'start': '{{ slot.start | timezone:ak.event.timezone | date:"Y-m-d H:i:s" }}',
'end': '{{ slot.end | timezone:ak.event.timezone | date:"Y-m-d H:i:s" }}',
- 'url' : '{% url "plan:plan_room" event_slug=ak.event.slug pk=slot.room.pk %}'
+ 'url' : '{% if slot.room %}{% url "plan:plan_room" event_slug=ak.event.slug pk=slot.room.pk %}{% else %}#{% endif %}'
},
{% endif %}
{% endfor %}
diff --git a/AKSubmission/templates/AKSubmission/ak_detail.html b/AKSubmission/templates/AKSubmission/ak_detail.html
index 758b175a..483e66e3 100644
--- a/AKSubmission/templates/AKSubmission/ak_detail.html
+++ b/AKSubmission/templates/AKSubmission/ak_detail.html
@@ -170,6 +170,12 @@
<a href="{% url 'submit:akslot_delete' event_slug=ak.event.slug pk=slot.pk %}"
data-toggle="tooltip" title="{% trans 'Delete' %}"
class="btn btn-danger">{% fa5_icon 'times' 'fas' %}</a>
+ {% else %}
+ {% if "AKOnline"|check_app_installed and slot.room and slot.room.virtualroom and slot.room.virtualroom.url != '' %}
+ <a class="btn btn-success" href="{{ slot.room.virtualroom.url }}">
+ {% fa5_icon 'external-link-alt' 'fas' %} {% trans "Go to virtual room" %}
+ </a>
+ {% endif %}
{% endif %}
{% if user.is_staff %}
<a href="{% url 'admin:AKModel_akslot_change' slot.pk %}"
--
GitLab