From ae9f3d66f06b767c9fd76c14775b983f6c2120aa Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@0d.be>
Date: Sat, 14 Sep 2013 17:10:28 +0200
Subject: [PATCH] display news category in news roll

---
 panikweb/views.py                           | 9 ++++-----
 panikweb_templates/templates/news/roll.html | 8 +++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/panikweb/views.py b/panikweb/views.py
index 75af9c6..4b7a0e6 100644
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -400,7 +400,7 @@ class Home(TemplateView):
     def get_context_data(self, **kwargs):
         context = super(Home, self).get_context_data(**kwargs)
         context['sectionName'] = "Home"
-        context['focus'] = list(NewsItem.objects.all().filter(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[0:5])
+        context['focus'] = NewsItem.objects.select_related('category').filter(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[:9]
         context['emissions'] = list(Emission.objects.filter(archived=False).order_by('title'))
         schedules = Schedule.objects.select_related().order_by('datetime')
         days = []
@@ -441,7 +441,7 @@ 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.all().filter(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[0:9])
+        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()
         return context
 newsitemview = NewsItemView.as_view()
@@ -451,9 +451,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.all().filter(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[0:9])
-        context['news'] = list(NewsItem.objects.all().exclude(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[3:14])
-        context['categories'] = NewsCategory.objects.all()
+        context['focus'] = NewsItem.objects.select_related('category').filter(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[:9]
+        context['news'] = NewsItem.objects.all().exclude(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-date')[3:14]
         return context
 
 news = News.as_view()
diff --git a/panikweb_templates/templates/news/roll.html b/panikweb_templates/templates/news/roll.html
index a9c8f8d..2e5bd80 100644
--- a/panikweb_templates/templates/news/roll.html
+++ b/panikweb_templates/templates/news/roll.html
@@ -9,13 +9,11 @@
 				<li class="{% if forloop.counter > 3 %}largeScreens{% endif %}">
 					<a title="{{content.title|striptags|addslashes}}" class="block news relative" href="{% url 'news-view' slug=content.slug %}">					
 						{% if content.image %}	
-							<!--
+						{% if content.category %}
 							<div class="labels absolute">
-								<span class="item inBlock">Cd-Dvd</span>
-								<span class="item inBlock">Concours</span>
-								<span class="item inBlock">Fête</span>
+								<span class="item inBlock">{{ content.category.title }}</span>
 							</div>	
-							-->
+						{% endif %}
 							<div class="absolute title ">
 								<h5 class="ellipsis">{{ content.date|date:"D m/m" }}</h5>
 							</div>	
-- 
2.39.2