From 00dfd5b568d06748eeed3bc019d3b6a11ed99bab Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 24 May 2016 18:19:01 +0200 Subject: [PATCH] fix empty DB --- app/festival/templatetags/festival_tags.py | 38 ++++++++++++++-------- lib/mezzanine-agenda | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/festival/templatetags/festival_tags.py b/app/festival/templatetags/festival_tags.py index 092d31bc..27370952 100644 --- a/app/festival/templatetags/festival_tags.py +++ b/app/festival/templatetags/festival_tags.py @@ -24,28 +24,38 @@ def featured_edito(*args): @register.as_tag def featured_events(*args): - return Featured.objects.all()[0].events.order_by('start') + featured = Featured.objects.all() + if featured: + return featured[0].events.order_by('start') + return None @register.as_tag def featured(*args): - featured = Featured.objects.get(id=settings.HOME_FEATURED_ID) featured_list = [] - for post in featured.blogposts.all(): - featured_list.append(post) - for video in featured.videos.all(): - featured_list.append(video) - for artist in featured.artists.all(): - featured_list.append(artist) - for playlist in featured.playlists.all(): - featured_list.append(playlist) - shuffle(featured_list) + featured = Featured.objects.filter(id=settings.HOME_FEATURED_ID) + if featured: + featured = featured[0] + for post in featured.blogposts.all(): + featured_list.append(post) + for video in featured.videos.all(): + featured_list.append(video) + for artist in featured.artists.all(): + featured_list.append(artist) + for playlist in featured.playlists.all(): + featured_list.append(playlist) + shuffle(featured_list) return featured_list @register.as_tag def featured_breaking_news_content(*args): - news = Featured.objects.get(id=settings.BREAKING_NEWS_FEATURED_ID).pages.all() - if news: - return news[0].richtextpage.content + featured = Featured.objects.filter(id=settings.BREAKING_NEWS_FEATURED_ID) + if featured: + featured = featured[0] + news = featured.pages.all() + if news: + return news[0].richtextpage.content + else: + return '' return '' @register.filter diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index b3bd1a96..383ca0db 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit b3bd1a965454d31ffb15291b159abf68fe0cbebf +Subproject commit 383ca0db02232cf761e1e489ed1315a58cb95693 -- 2.39.5