ctactic/aircox-radiocampus
1
0
Fork 0
forked from rc/aircox
Code Issues 8 Pull Requests Activity

work on admin interface, player, list of sounds

Browse Source
This commit is contained in:
bkfox
2016-08-10 00:58:05 +02:00
parent f5dbc93f7f
commit 021b2a116a
19 changed files with 566 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cms/sections.py
View File

@ -221,19 +221,18 @@ class ListBase(models.Model):
else:
qs = qs.descendant_of(related)
date = self.related.date if hasattr('date', related) else \
date = self.related.date if hasattr(related, 'date') else \
self.related.first_published_at
if self.date_filter == self.DateFilter.before_related:
qs = qs.filter(date__lt = date)
elif self.date_filter == self.DateFilter.after_related:
qs = qs.filter(date__gte = date)
# date
else:
date = tz.now()
if self.date_filter == self.DateFilter.previous:
qs = qs.filter(date__lt = date)
elif self.date_filter == self.DateFilter.next:
qs = qs.filter(date__gte = date)
date = tz.now()
if self.date_filter == self.DateFilter.previous:
qs = qs.filter(date__lt = date)
elif self.date_filter == self.DateFilter.next:
qs = qs.filter(date__gte = date)
# sort
if self.asc:
@ -332,9 +331,7 @@ class ListBase(models.Model):
search = request.GET.get('search')
if search:
kwargs['terms'] = search
print(search, qs)
qs = qs.search(search)
print(qs.count())
set('list_selector', kwargs)
@ -342,7 +339,7 @@ class ListBase(models.Model):
if qs:
paginator = Paginator(qs, 30)
try:
qs = paginator.page('page')
qs = paginator.page(request.GET.get('page') or 1)
except PageNotAnInteger:
qs = paginator.page(1)
except EmptyPage:
@ -803,7 +800,7 @@ class SectionList(ListBase, SectionRelativeItem):
'list. If empty, does not print an address'),
)
panels = SectionItem.panels + [
panels = SectionRelativeItem.panels + [
MultiFieldPanel([
FieldPanel('focus_available'),
FieldPanel('count'),
@ -815,6 +812,9 @@ class SectionList(ListBase, SectionRelativeItem):
from aircox.cms.models import Publication
context = super().get_context(request, page)
if self.is_related:
self.related = page
qs = self.get_queryset()
qs = qs.live()
if self.focus_available: