Fix MySQL package

Fix bug in date/time question stats

Dockerfile

@@ -3,7 +3,7 @@ FROM python:3.6
 RUN apt-get update && \
     apt-get install -y git libxml2-dev libxslt1-dev python-dev python-virtualenv locales \
       libffi-dev build-essential python3-dev zlib1g-dev libssl-dev gettext libpq-dev \
-      libmysqlclient-dev libmemcached-dev libjpeg-dev supervisor nginx sudo \
+      default-libmysqlclient-dev libmemcached-dev libjpeg-dev supervisor nginx sudo \
 	  --no-install-recommends && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \

src/MANIFEST.in

@@ -18,3 +18,5 @@ recursive-include pretix/plugins/stripe/templates *
 recursive-include pretix/plugins/stripe/static *
 recursive-include pretix/plugins/ticketoutputpdf/templates *
 recursive-include pretix/plugins/ticketoutputpdf/static *
+recursive-include pretix/plugins/badges/templates *
+recursive-include pretix/plugins/badges/static *

src/pretix/__init__.py

@@ -1 +1 @@
-__version__ = "1.15.0"
+__version__ = "1.15.2"

src/pretix/base/models/items.py

@@ -465,7 +465,7 @@ class ItemVariation(models.Model):
         return self.default_price if self.default_price is not None else self.item.default_price
 
     def tax(self, price=None):
-        price = price or self.price
+        price = price if price is not None else self.price
         if not self.item.tax_rule:
             return TaxedPrice(gross=price, net=price, tax=Decimal('0.00'), rate=Decimal('0.00'), name='')
         return self.item.tax_rule.tax(price)

src/pretix/control/templates/pretixcontrol/subevents/index.html

@@ -16,6 +16,9 @@
             <a href="{% url "control:event.subevents.add" organizer=request.event.organizer.slug event=request.event.slug %}"
                     class="btn btn-primary btn-lg"><i class="fa fa-plus"></i>
                 {% trans "Create a new date" context "subevent" %}</a>
+            <a href="{% url "control:event.subevents.bulk" organizer=request.event.organizer.slug event=request.event.slug %}"
+                    class="btn btn-primary btn-lg"><i class="fa fa-plus"></i>
+                {% trans "Create many new dates" context "subevent" %}</a>
         </div>
     {% else %}
         <form class="row filter-form" action="" method="get">

src/pretix/control/views/item.py

@@ -428,11 +428,11 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
                 del a['options__answer']
         elif self.object.type in (Question.TYPE_TIME, Question.TYPE_DATE, Question.TYPE_DATETIME):
             qs = qs.order_by('answer')
-            qs_model = qs
-            qs = qs.values('answer').annotate(count=Count('id')).order_by('-count')
-            for a, a_model in zip(qs, qs_model):
+            model_cache = {a.answer: a for a in qs}
+            qs = qs.values('answer').annotate(count=Count('id')).order_by('answer')
+            for a in qs:
                 a['alink'] = a['answer']
-                a['answer'] = str(a_model)
+                a['answer'] = str(model_cache[a['answer']])
         else:
             qs = qs.order_by('answer').values('answer').annotate(count=Count('id')).order_by('-count')
 

src/pretix/presale/templates/pretixpresale/event/index.html

@@ -167,7 +167,7 @@
                             {% blocktrans trimmed with time=ev.date_from|date:"TIME_FORMAT" %}
                                 Begin: {{ time }}
                             {% endblocktrans %}
-                            {% if event.settings.show_date_to %}
+                            {% if event.settings.show_date_to and ev.date_to %}
                                 <br>
                                 {% blocktrans trimmed with time=ev.date_to|date:"TIME_FORMAT" %}
                                     End: {{ time }}

src/requirements/production.txt

@@ -17,7 +17,7 @@ django-otp==0.3.*
 python-u2flib-server==4.*
 django-formtools==2.0
 celery==4.1.*
-kombu==4.1.*
+kombu==4.2.*
 django-statici18n==1.3.*
 inlinestyler==0.2.*
 BeautifulSoup4

src/setup.py

@@ -82,7 +82,7 @@ setup(
         'python-u2flib-server==4.*',
         'django-formtools==2.0',
         'celery==4.1.*',
-        'kombu==4.1.*',
+        'kombu==4.2.*',
         'django-statici18n==1.3.*',
         'inlinestyler==0.2.*',
         'BeautifulSoup4',