From 2b732d3967e8eb10ebd0b60c11f49425750f369a Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 1 Apr 2015 12:03:30 +0200
Subject: [PATCH] Fix some comparisons that broke in the last change

---
 src/pretix/control/templates/pretixcontrol/order/index.html   | 2 +-
 src/pretix/control/views/orders.py                            | 2 +-
 .../presale/templates/pretixpresale/event/fragment_cart.html  | 2 +-
 src/pretix/presale/views/__init__.py                          | 2 +-
 src/pretix/presale/views/checkout.py                          | 4 ++--
 src/pretix/presale/views/event.py                             | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pretix/control/templates/pretixcontrol/order/index.html b/src/pretix/control/templates/pretixcontrol/order/index.html
index f6a2841fd..c890ddae1 100644
--- a/src/pretix/control/templates/pretixcontrol/order/index.html
+++ b/src/pretix/control/templates/pretixcontrol/order/index.html
@@ -49,7 +49,7 @@
                         {% endif %}
                         {% if line.has_questions %}
                             <dl>
-                                {% if line.item.admission and event.settings.attendee_names_asked == 'True' %}
+                                {% if line.item.admission and event.settings.attendee_names_asked %}
                                     <dt>{% trans "Attendee name" %}</dt>
                                     <dd>{% if line.attendee_name %}{{ line.attendee_name }}{% else %}<em>{% trans "not answered" %}</em>{% endif %}</dd>
                                 {% endif %}
diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py
index b6afbd8ae..2580dffb5 100644
--- a/src/pretix/control/views/orders.py
+++ b/src/pretix/control/views/orders.py
@@ -76,7 +76,7 @@ class OrderDetail(EventPermissionRequiredMixin, OrderView):
         # We do this by list manipulations instead of a GROUP BY query, as
         # Django is unable to join related models in a .values() query
         def keyfunc(pos):
-            if ((pos.item.admission and self.request.event.settings.attendee_names_asked == 'True')
+            if ((pos.item.admission and self.request.event.settings.attendee_names_asked)
                     or pos.item.questions.all()):
                 return pos.id, "", "", ""
             return "", pos.item_id, pos.variation_id, pos.price
diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
index 509348f5a..55d883cf9 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
@@ -8,7 +8,7 @@
             {% endif %}
         {% if line.has_questions %}
             <dl>
-                {% if line.item.admission and event.settings.attendee_names_asked == 'True' %}
+                {% if line.item.admission and event.settings.attendee_names_asked%}
                     <dt>{% trans "Attendee name" %}</dt>
                     <dd>{% if line.attendee_name %}{{ line.attendee_name }}{% else %}<em>{% trans "not answered" %}</em>{% endif %}</dd>
                 {% endif %}
diff --git a/src/pretix/presale/views/__init__.py b/src/pretix/presale/views/__init__.py
index 62761c46d..7223c86e8 100644
--- a/src/pretix/presale/views/__init__.py
+++ b/src/pretix/presale/views/__init__.py
@@ -73,7 +73,7 @@ class CartDisplayMixin:
         # We do this by list manipulations instead of a GROUP BY query, as
         # Django is unable to join related models in a .values() query
         def keyfunc(pos):
-            if answers and ((pos.item.admission and self.request.event.settings.attendee_names_asked == 'True')
+            if answers and ((pos.item.admission and self.request.event.settings.attendee_names_asked)
                             or pos.item.questions.all()):
                 return pos.id, "", "", ""
             return "", pos.item_id, pos.variation_id, pos.price
diff --git a/src/pretix/presale/views/checkout.py b/src/pretix/presale/views/checkout.py
index 315bd7a65..94c6d3dd4 100644
--- a/src/pretix/presale/views/checkout.py
+++ b/src/pretix/presale/views/checkout.py
@@ -39,9 +39,9 @@ class QuestionsForm(forms.Form):
 
         super().__init__(*args, **kwargs)
 
-        if item.admission and event.settings.attendee_names_asked == 'True':
+        if item.admission and event.settings.attendee_names_asked:
             self.fields['attendee_name'] = forms.CharField(
-                max_length=255, required=(event.settings.attendee_names_required == 'True'),
+                max_length=255, required=event.settings.attendee_names_required,
                 label=_('Attendee name'),
                 initial=(cartpos.attendee_name if cartpos else orderpos.attendee_name)
             )
diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py
index 338a0d6e6..efdcb5fa9 100644
--- a/src/pretix/presale/views/event.py
+++ b/src/pretix/presale/views/event.py
@@ -183,7 +183,7 @@ class LocalRegistrationForm(forms.Form):
     def __init__(self, request, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.request = request
-        self.fields['email'].required = (request.event.settings.user_mail_required == 'True')
+        self.fields['email'].required = request.event.settings.user_mail_required
 
     def clean(self):
         password1 = self.cleaned_data.get('password')