This commit is contained in:
bkfox
2020-05-20 12:09:04 +02:00
parent 05210f015d
commit 84483ecd3c
19 changed files with 19 additions and 24 deletions

View File

@ -1,6 +1,6 @@
from django.contrib import admin
from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from django.views.generic import ListView
from .log import LogListView

View File

@ -13,14 +13,9 @@ class ArticleDetailView(PageDetailView):
def get_sidebar_queryset(self):
qs = Article.objects.select_related('cover') \
.filter(is_static=False) \
.order_by('-date')
.order_by('-pub_date')
return qs
def get_context_data(self, **kwargs):
if self.object.program is not None:
kwargs.setdefault('parent', self.object.program)
return super().get_context_data(**kwargs)
class ArticleListView(ParentMixin, PageListView):
model = Article

View File

@ -2,7 +2,7 @@ from collections import OrderedDict
import datetime
from django.views.generic import ListView
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from ..models import Diffusion, Episode, Program, Sound
from .base import BaseView

View File

@ -1,6 +1,6 @@
import datetime
from django.utils.translation import ugettext as _
from django.utils.translation import gettext as _
from django.utils import timezone as tz
from ..models import Diffusion, Log, Page

View File

@ -1,6 +1,6 @@
from django.http import Http404, HttpResponse
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
from django.views.generic import DetailView, ListView
from honeypot.decorators import check_honeypot