Aggregation doesn't work with generic relations.

[prawokultury.git] / prawokultury / menu_items.py

diff --git a/prawokultury/menu_items.py b/prawokultury/menu_items.py
index f68b005..1da9c69 100644 (file)
--- a/prawokultury/menu_items.py
+++ b/prawokultury/menu_items.py
@@ -7,28 +7,24 @@ from django.utils.translation import ugettext_lazy as _
 
 ITEMS = []
 
-def add_entry(**qs):
-    try:
-        entry = Entry.objects.get(**qs)
-    except Entry.DoesNotExist:
-        return
-    if not entry.published:
-        return
-    ITEMS.append(ObjectMenuItem(entry))
-
-add_entry(slug_pl='o-nas')
+ITEMS.append(ObjectMenuItem(
+    obj_get=lambda:Entry.published_objects.get(slug_pl='o-nas')
+))
 
 ITEMS.append(ModelMenuItem(Entry, reverse_lazy('migdal_entry_list_publications'),
         field_lookups={'type': 'publications'}, title=_('Publications')))
 
-ITEMS.append(MenuItem(reverse_lazy('events'), _('Events'),
-        more_urls=(reverse_lazy('events_past'),)))
+ITEMS.append(MenuItem(reverse_lazy('events'), _('Events')))
 
-ITEMS.append(ObjectMenuItem(Category.objects.get(slug_pl='stanowisko'),
-    rev_lookups={Entry: 'categories'}, title=_('Positions')))
-#CategoryMenuItem(Category.objects.get(slug_pl='stanowisko'),
-#            title=_('Positions')),
+ITEMS.append(ObjectMenuItem(
+    obj_get=lambda:Category.objects.get(slug_pl='stanowisko'),
+    rev_lookups={Entry: 'categories'},
+    title=_('Positions')
+))
 
-ITEMS.append(ObjectMenuItem(Entry.objects.get(slug_pl='pierwsza-pomoc'),
-    title=_('First aid in copyright')))
+ITEMS.append(MenuItem(reverse_lazy('questions'), _('First aid')))
 
+ITEMS.append(ObjectMenuItem(
+    obj_get=lambda:Entry.published_objects.get(slug_pl='pierwsza-pomoc'),
+    title=_('Guide')
+))