From d5020855870d0ba5da614fcf9aa97871ea1fb1f6 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Wed, 2 Aug 2017 12:36:39 +0200
Subject: [PATCH] Update linking
---
journals/templates/journals/journals.html | 6 +++++-
journals/views.py | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/journals/templates/journals/journals.html b/journals/templates/journals/journals.html
index ab61c79d8..1c5bd9fd8 100644
--- a/journals/templates/journals/journals.html
+++ b/journals/templates/journals/journals.html
@@ -6,7 +6,11 @@
<nav class="submenu">
<span class="item">Our Journals:</span>
{% for journal in journals %}
- <a href="{{journal.get_absolute_url}}" class="item">{{journal}}</a>
+ {% if journal.active %}
+ <a href="{{journal.get_absolute_url}}" class="item">{{journal}}</a>
+ {% else %}
+ <a href="{% url 'journal:about' journal.name %}" class="item">{{journal}}</a>
+ {% endif %}
{% endfor %}
</nav>
{% endblock %}
diff --git a/journals/views.py b/journals/views.py
index 6dbf0f2d7..a6e7f7a07 100644
--- a/journals/views.py
+++ b/journals/views.py
@@ -37,7 +37,7 @@ from guardian.decorators import permission_required
def journals(request):
'''Main landing page for Journals application.'''
- context = {'journals': Journal.objects.active().order_by('name')}
+ context = {'journals': Journal.objects.order_by('name')}
return render(request, 'journals/journals.html', context)
--
GitLab