From 060a2e8b9b8dbfbf7f0bb32e8d3f80cdb0e1b7b6 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Sun, 5 Apr 2015 23:31:12 +0200
Subject: [PATCH] Fix ItemCategory __str__()

---
 src/pretix/base/models.py                                   | 2 +-
 src/pretix/control/templates/pretixcontrol/items/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pretix/base/models.py b/src/pretix/base/models.py
index 4faccccee..a9e24d15f 100644
--- a/src/pretix/base/models.py
+++ b/src/pretix/base/models.py
@@ -562,7 +562,7 @@ class ItemCategory(Versionable):
         ordering = ('position', 'id')
 
     def __str__(self):
-        return self.name
+        return str(self.name)
 
     def delete(self, *args, **kwargs):
         super().delete(*args, **kwargs)
diff --git a/src/pretix/control/templates/pretixcontrol/items/index.html b/src/pretix/control/templates/pretixcontrol/items/index.html
index f3e4556b3..8f9a333ca 100644
--- a/src/pretix/control/templates/pretixcontrol/items/index.html
+++ b/src/pretix/control/templates/pretixcontrol/items/index.html
@@ -19,7 +19,7 @@
 			<tr>
 				<td><strong><a href="
 				{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=i.identity %}">{{ i.name }}</a></strong></td>
-				<td>{% if i.category %}{{ i.category }}{% endif %}</td>
+				<td>{% if i.category %}{{ i.category.name }}{% endif %}</td>
 			</tr>
 			{% endfor %}
 		</tbody>