Empty guestbooks dont crash

josven · Aug 8, 2012 · a733ad2 · a733ad2
1 parent b7d1287
commit a733ad2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/apps/accounts/views.py b/apps/accounts/views.py
@@ -9,6 +9,7 @@
 from django.contrib.auth.forms import PasswordChangeForm
 from django.contrib import messages
 from django.contrib.humanize.templatetags.humanize import naturalday
+from django.http import Http404
 
 from apps.core.utils import render, get_datatables_records
 

diff --git a/apps/core/static/js/frontpage.js b/apps/core/static/js/frontpage.js
@@ -200,5 +200,4 @@ jQuery(document).ready(function() {
 
 		return false;
 	});
-
 });
diff --git a/apps/notifications/templatetags/notification_tags.py b/apps/notifications/templatetags/notification_tags.py
@@ -46,9 +46,10 @@ def get_notes_for_articlelist(context, queryset, user):
 @register.assignment_tag(takes_context=True)
 def get_notes_for_guestbook(context, queryset, user):
 
-    notifications = _get_notifications_for_qs(queryset, user)
-    queryset = _assign_notifications_on_qs(queryset, notifications)
-    new_notifications = _set_status_on_qs(notifications, 3)
+    if len(queryset) > 0:
+        notifications = _get_notifications_for_qs(queryset, user)
+        queryset = _assign_notifications_on_qs(queryset, notifications)
+        new_notifications = _set_status_on_qs(notifications, 3)
 
     return queryset