diff --git a/django/journal/models.py b/django/journal/models.py index fe81a8b..61a193a 100644 --- a/django/journal/models.py +++ b/django/journal/models.py @@ -154,6 +154,12 @@ class Issue(models.Model): else: return self.articles.all() + def get_ordered_articles(self): + if self.published: + return self.articles.filter(published=True).exclude(category__slug='inquiry').order_by('featured__order_on_homepage') + else: + return self.articles.all() + # Use h2 or h3 in footer depending on the length of the title. def get_title_header(self): if len(self.title) > 30: diff --git a/django/journal/views.py b/django/journal/views.py index b5f88b5..8c7a5b7 100644 --- a/django/journal/views.py +++ b/django/journal/views.py @@ -69,7 +69,7 @@ def view_article(request, slug): # If there are other languages, add the main article (for English). translations.append(article) - articles = article.issue.get_articles().filter(published=True).order_by('featured__order_on_homepage') + articles = article.issue.get_ordered_articles() context = { 'translations': translations, 'article': article, diff --git a/django/templates/issue.html b/django/templates/issue.html index 799edc4..abc646d 100644 --- a/django/templates/issue.html +++ b/django/templates/issue.html @@ -52,7 +52,7 @@
- {% for article in issue.get_articles %} + {% for article in issue.get_ordered_articles %}
{% include 'article_thumb.html' with article=article only %}
diff --git a/django/templates/page.html b/django/templates/page.html index 1cbcaf1..f1d7568 100644 --- a/django/templates/page.html +++ b/django/templates/page.html @@ -27,6 +27,7 @@
+

{{ page.title }}
@@ -38,6 +39,7 @@

+

{% include "ads.html" %}