better unicode admin

diff --git a/app/festival/admin.py b/app/festival/admin.py
index 65fba3f1b408e97eceda4f17569b846672f527e0..fa18242d8d51eca77572f4bd8f83241d443b7450 100644 (file)
--- a/app/festival/admin.py
+++ b/app/festival/admin.py
@@ -47,9 +47,16 @@ class ArtistAdminDisplayable(DisplayableAdmin):
 class PlaylistAdmin(admin.ModelAdmin):
 
     model = Playlist
+    list_display = ('__unicode__',)
     filter_horizontal = ['audios']
 
-admin.site.register(PageCategory)
+class PageCategoryAdmin(admin.ModelAdmin):
+
+    model = PageCategory
+    list_display = ('__unicode__',)
+
+
+admin.site.register(PageCategory, PageCategoryAdmin)
 admin.site.register(Artist, ArtistAdminDisplayable)
 admin.site.register(Video, VideoAdminDisplayable)
 admin.site.register(Audio, AudioAdminDisplayable)

diff --git a/app/festival/models.py b/app/festival/models.py
index 487f32021d240b0b95b583e2ad91cbfeef9a8180..47abc3d61cf5a58444aded9de3c6b15e8ae3527b 100644 (file)
--- a/app/festival/models.py
+++ b/app/festival/models.py
@@ -57,6 +57,9 @@ class PageCategory(BaseNameModel):
     class Meta(MetaCore):
         verbose_name = _('page category')
 
+    def __unicode__(self):
+        return self.name
+
 
 class Artist(Displayable, RichText, AdminThumbMixin):
     """Artist"""
@@ -189,3 +192,6 @@ class Playlist(BaseTitleModel):
 
     audios = models.ManyToManyField(Audio, verbose_name=_('audios'), related_name='playlists', blank=True)
     event = models.ForeignKey(Event, related_name='playlists', verbose_name=_('event'), blank=True, null=True, on_delete=models.SET_NULL)
+
+    def __unicode__(self):
+        return self.title

diff --git a/app/festival/templatetags/festival_tags.py b/app/festival/templatetags/festival_tags.py
index 980d7c0c715a4390f656676108690e6ba1a8a81a..e760556f2cebabe7e48f29047828254a75273b1e 100644 (file)
--- a/app/festival/templatetags/festival_tags.py
+++ b/app/festival/templatetags/festival_tags.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from mezzanine.pages.models import Page
+from mezzanine.blog.models import BlogPost
 from mezzanine.template import Library
 from mezzanine_agenda.models import Event
 from festival.models import *
@@ -7,8 +8,13 @@ from mezzanine.conf import settings
 
 register = Library()
 
+
+@register.filter
+def subtract(value, arg):
+    return value - arg
+
 @register.as_tag
-def festival_edito(*args):
+def featured_edito(*args):
     qs = Page.objects.filter(slug="edito")
     if qs:
         return qs[0].get_content_model()
@@ -16,7 +22,7 @@ def festival_edito(*args):
         return None
 
 @register.as_tag
-def festival_event_featured(*args):
+def featured_events(*args):
     models = [Event,]
     featured = []
     for model in models:
@@ -26,10 +32,6 @@ def festival_event_featured(*args):
                 featured.append(obj)
     return featured
 
-@register.filter
-def subtract(value, arg):
-    return value - arg
-
 @register.as_tag
 def featured_artist(*args):
     return Artist.objects.filter(featured=True).order_by('?').first()
@@ -40,4 +42,12 @@ def featured_video(*args):
 
 @register.as_tag
 def featured_playlist(*args):
-    return Playlist.objects.filter(event=None)[0]
+    return Playlist.objects.filter(event=None).order_by('?').first()
+
+@register.as_tag
+def featured_pages(*args):
+    return Page.objects.filter(featured=True)
+
+@register.as_tag
+def featured_posts(*args):
+    return BlogPost.objects.filter(featured=True)

diff --git a/app/templates/base.html b/app/templates/base.html
index 7e9948893d8d9f8f3f1b6f773ff25abe32cb2c19..3b7bb20847cc34bea55fb90a6319d640f3330e83 100644 (file)
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -89,7 +89,7 @@
     {% if on_home %}
     <div class="hero__slider">
         <ul id="lightSlider">
-            {% festival_event_featured as events %}
+            {% featured_events as events %}
             {% for event in events %}
               <li class="hero__slider__item" style="background-image: url({{ event.featured_image_header.url }});">
                   <div class="hero__slider__infos">

diff --git a/app/templates/index.html b/app/templates/index.html
index 3b73f53a2b9aa5dc25184c7cb2a2d87136ef971b..21f08737778713bd936594817e41c2237dd81c13 100644 (file)
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -15,11 +15,9 @@
 {% featured_video as video %}
 {% include 'festival/inc/video_card.html' %}
 
-{% }
-{% featured_playlist as playlist %}
+{% featured_edito as page %}
 {% include 'festival/audio_playlist.html' %}
 
-
 {% featured_playlist as playlist %}
 {% include 'festival/audio_playlist.html' %}