From c547cb6a9b78eb5eb53d9db446707fd478ca9f7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Wed, 4 Mar 2020 00:13:31 +0100
Subject: [PATCH] Fix dashboard links & improve decoupling
Adapt dashboard links to new URL structure of plan
Introduce conditional loading of paths to central URL file
---
AKDashboard/templates/AKDashboard/dashboard.html | 4 ++--
AKPlanning/urls.py | 13 ++++++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/AKDashboard/templates/AKDashboard/dashboard.html b/AKDashboard/templates/AKDashboard/dashboard.html
index 5f4df6f2..1e54236d 100644
--- a/AKDashboard/templates/AKDashboard/dashboard.html
+++ b/AKDashboard/templates/AKDashboard/dashboard.html
@@ -25,14 +25,14 @@
{% if 'AKPlan'|check_app_installed %}
<a class="dashboard-box btn btn-primary"
- href="{% url 'plan:ak_plan_current_next' event_slug=event.slug %}">
+ href="{% url 'plan:plan_overview' event_slug=event.slug %}">
<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
<span class="fa fa-list-ul"></span>
<span class='text'>{% trans 'Current AKs' %}</span>
</div>
</a>
<a class="dashboard-box btn btn-primary"
- href="{% url 'plan:ak_plan_timeline' event_slug=event.slug %}">
+ href="{% url 'plan:plan_wall' event_slug=event.slug %}">
<div class="col-sm-12 col-md-3 col-lg-2 dashboard-button">
<span class="fa fa-calendar"></span>
<span class='text'>{% trans "AK Wall" %}</span>
diff --git a/AKPlanning/urls.py b/AKPlanning/urls.py
index 76f8b94e..c7c04a38 100644
--- a/AKPlanning/urls.py
+++ b/AKPlanning/urls.py
@@ -13,12 +13,19 @@ Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
+from django.apps import apps
from django.contrib import admin
from django.urls import path, include
urlpatterns = [
path('admin/', admin.site.urls),
- path('', include('AKSubmission.urls', namespace='submit')),
- path('', include('AKDashboard.urls', namespace='dashboard')),
- path('i18n/', include('django.conf.urls.i18n')),
+ path('i18n/', include('django.conf.urls.i18n'))
]
+
+# Load URLs dynamically (only if components are active)
+if apps.is_installed("AKSubmission"):
+ urlpatterns.append(path('', include('AKSubmission.urls', namespace='submit')))
+if apps.is_installed("AKDashboard"):
+ urlpatterns.append(path('', include('AKDashboard.urls', namespace='dashboard')))
+if apps.is_installed("AKPlan"):
+ urlpatterns.append(path('', include('AKPlan.urls', namespace='plan')))
--
GitLab