From 03184bdbf2ec5734367dfb8eaf83582ec30c4541 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 18 Feb 2015 19:45:48 +0100
Subject: [PATCH] Deal with items that belong to no category

---
 src/pretix/presale/templates/pretixpresale/event/index.html | 2 +-
 src/pretix/presale/tests.py                                 | 3 ---
 src/pretix/presale/views/event.py                           | 5 +++--
 3 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 src/pretix/presale/tests.py

diff --git a/src/pretix/presale/templates/pretixpresale/event/index.html b/src/pretix/presale/templates/pretixpresale/event/index.html
index 583cff30f..1a0977ea7 100644
--- a/src/pretix/presale/templates/pretixpresale/event/index.html
+++ b/src/pretix/presale/templates/pretixpresale/event/index.html
@@ -35,7 +35,7 @@
         {% csrf_token %}
         {% for tup in items_by_category %}
             <section>
-                <h3>{{ tup.0.name }}</h3>
+                {% if tup.0 %}<h3>{{ tup.0.name }}</h3>{% endif %}
                 {% for item in tup.1 %}
                     {% if item.has_variations %}
                         <div class="row-fluid product-row headline">
diff --git a/src/pretix/presale/tests.py b/src/pretix/presale/tests.py
deleted file mode 100644
index 7ce503c2d..000000000
--- a/src/pretix/presale/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py
index f3172e353..7dabb8455 100644
--- a/src/pretix/presale/views/event.py
+++ b/src/pretix/presale/views/event.py
@@ -49,9 +49,10 @@ class EventIndex(EventViewMixin, CartDisplayMixin, TemplateView):
         # Regroup those by category
         context['items_by_category'] = sorted([
             # a group is a tuple of a category and a list of items
-            (cat, [i for i in items if i.category_id == cat.identity])
+            (cat, [i for i in items if i.category == cat])
             for cat in set([i.category for i in items])  # insert categories into a set for uniqueness
-        ], key=lambda group: (group[0].position, group[0].pk))  # a set is unsorted, so sort again by category
+            # a set is unsorted, so sort again by category
+        ], key=lambda group: (group[0].position, group[0].identity) if group[0] is not None else (0, ""))
 
         context['cart'] = self.get_cart() if self.request.user.is_authenticated() else None
         return context