Merge branch 'master' into wip/side-player

[panikweb.git] / panikweb / views.py

diff --git a/panikweb/views.py b/panikweb/views.py
index a0fd27696b4b776d8e8ddb358e1fbd2684f067d7..ac928fcc167fe8015997429f024400c7bd6e11b2 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -23,7 +23,7 @@ from haystack.query import SearchQuerySet
 from jsonresponse import to_json
 
 from emissions.models import Category, Emission, Episode, Diffusion, SoundFile, \
-        Schedule, Nonstop, NewsItem, NewsCategory
+        Schedule, Nonstop, NewsItem, NewsCategory, Focus
 
 from emissions.utils import whatsonair, period_program
 
@@ -406,8 +406,8 @@ class Home(TemplateView):
     def get_context_data(self, **kwargs):
         context = super(Home, self).get_context_data(**kwargs)
         context['sectionName'] = "Home"
-        context['focus'] = NewsItem.objects.select_related('category').filter(
-                focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('?')[:12]
+        context['focus'] = Focus.objects.select_related('emission', 'newsitem',
+                'soundfile', 'episode', 'newsitem__category').order_by('?')[:12]
         context['emissions'] = Emission.objects.filter(archived=False,
                 creation_timestamp__gte=datetime(2013, 9, 13)).order_by('title')
 
@@ -432,7 +432,6 @@ class NewsItemView(DetailView):
     def get_context_data(self, **kwargs):
         context = super(NewsItemView, self).get_context_data(**kwargs)
         context['sectionName'] = "News"
-        context['focus'] = list(NewsItem.objects.select_related('category').filter(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[0:9])
         context['categories'] = NewsCategory.objects.all()
         context['news'] = NewsItem.objects.all().exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[:10]
         return context
@@ -443,7 +442,8 @@ class News(TemplateView):
     def get_context_data(self, **kwargs):
         context = super(News, self).get_context_data(**kwargs)
         context['sectionName'] = "News"
-        context['focus'] = list(NewsItem.objects.select_related('category').filter(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[0:9])
+        newsitem_ids = [x.newsitem_id for x in Focus.objects.filter(newsitem__isnull=False)]
+        context['focus'] = NewsItem.objects.filter(id__in=newsitem_ids).select_related('category').order_by('-date')[0:9]
         context['news'] = NewsItem.objects.all().exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[:30]
         return context