CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix some comparisons that broke in the last change

Browse Source
This commit is contained in:
Raphael Michel
2015-04-01 12:03:30 +02:00
parent cd0e1cb520
commit 2b732d3967
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/control/templates/pretixcontrol/order/index.html
View File

@@ -49,7 +49,7 @@
{% endif %} {% endif %}
{% if line.has_questions %} {% if line.has_questions %}
<dl> <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> <dt>{% trans "Attendee name" %}</dt>
<dd>{% if line.attendee_name %}{{ line.attendee_name }}{% else %}<em>{% trans "not answered" %}</em>{% endif %}</dd> <dd>{% if line.attendee_name %}{{ line.attendee_name }}{% else %}<em>{% trans "not answered" %}</em>{% endif %}</dd>
{% endif %} {% endif %}

2
src/pretix/control/views/orders.py
View File

@@ -76,7 +76,7 @@ class OrderDetail(EventPermissionRequiredMixin, OrderView):
# We do this by list manipulations instead of a GROUP BY query, as # We do this by list manipulations instead of a GROUP BY query, as
# Django is unable to join related models in a .values() query # Django is unable to join related models in a .values() query
def keyfunc(pos): 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()): or pos.item.questions.all()):
return pos.id, "", "", "" return pos.id, "", "", ""
return "", pos.item_id, pos.variation_id, pos.price return "", pos.item_id, pos.variation_id, pos.price

2
src/pretix/presale/templates/pretixpresale/event/fragment_cart.html
View File

@@ -8,7 +8,7 @@
{% endif %} {% endif %}
{% if line.has_questions %} {% if line.has_questions %}
<dl> <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> <dt>{% trans "Attendee name" %}</dt>
<dd>{% if line.attendee_name %}{{ line.attendee_name }}{% else %}<em>{% trans "not answered" %}</em>{% endif %}</dd> <dd>{% if line.attendee_name %}{{ line.attendee_name }}{% else %}<em>{% trans "not answered" %}</em>{% endif %}</dd>
{% endif %} {% endif %}

2
src/pretix/presale/views/__init__.py
View File

@@ -73,7 +73,7 @@ class CartDisplayMixin:
# We do this by list manipulations instead of a GROUP BY query, as # We do this by list manipulations instead of a GROUP BY query, as
# Django is unable to join related models in a .values() query # Django is unable to join related models in a .values() query
def keyfunc(pos): 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()): or pos.item.questions.all()):
return pos.id, "", "", "" return pos.id, "", "", ""
return "", pos.item_id, pos.variation_id, pos.price return "", pos.item_id, pos.variation_id, pos.price

4
src/pretix/presale/views/checkout.py
View File

@@ -39,9 +39,9 @@ class QuestionsForm(forms.Form):
super().__init__(*args, **kwargs) 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( 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'), label=_('Attendee name'),
initial=(cartpos.attendee_name if cartpos else orderpos.attendee_name) initial=(cartpos.attendee_name if cartpos else orderpos.attendee_name)
) )

2
src/pretix/presale/views/event.py
View File

@@ -183,7 +183,7 @@ class LocalRegistrationForm(forms.Form):
def __init__(self, request, *args, **kwargs): def __init__(self, request, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.request = request 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): def clean(self):
password1 = self.cleaned_data.get('password') password1 = self.cleaned_data.get('password')