From 30373097118fe19ef8e5e742804c2a3530abbea4 Mon Sep 17 00:00:00 2001
From: jlwt90 <jasonwaiting@live.hk>
Date: Fri, 3 Feb 2017 00:51:13 +0800
Subject: [PATCH] Fix #381 -- Add location field (#398)

* add location field

* rearrange the display order
---
 .../base/migrations/0061_event_location.py    | 21 +++++++++++++++++++
 src/pretix/base/models/event.py               |  7 +++++++
 src/pretix/control/forms/event.py             |  4 +++-
 .../pretixcontrol/event/settings.html         |  1 +
 .../pretixcontrol/events/create_basics.html   |  1 +
 5 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 src/pretix/base/migrations/0061_event_location.py

diff --git a/src/pretix/base/migrations/0061_event_location.py b/src/pretix/base/migrations/0061_event_location.py
new file mode 100644
index 000000000..37894b80e
--- /dev/null
+++ b/src/pretix/base/migrations/0061_event_location.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-01 04:31
+from __future__ import unicode_literals
+
+from django.db import migrations
+import pretix.base.i18n
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0060_auto_20170113_1438'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='event',
+            name='location',
+            field=pretix.base.i18n.I18nCharField(blank=True, max_length=200, null=True, verbose_name='Location'),
+        ),
+    ]
diff --git a/src/pretix/base/models/event.py b/src/pretix/base/models/event.py
index dfb9d5752..ac699f82e 100644
--- a/src/pretix/base/models/event.py
+++ b/src/pretix/base/models/event.py
@@ -51,6 +51,8 @@ class Event(LoggedModel):
     :type presale_start: datetime
     :param presale_end: No tickets will be sold after this date.
     :type presale_end: datetime
+    :param location: venue
+    :type location: str
     :param plugins: A comma-separated list of plugin names that are active for this
                     event.
     :type plugins: str
@@ -99,6 +101,11 @@ class Event(LoggedModel):
         verbose_name=_("Start of presale"),
         help_text=_("No products will be sold before this date."),
     )
+    location = I18nCharField(
+        null=True, blank=True,
+        max_length=200,
+        verbose_name=_("Location"),
+    )
     plugins = models.TextField(
         null=True, blank=True,
         verbose_name=_("Plugins"),
diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py
index 22756a48e..e8d0eee69 100644
--- a/src/pretix/control/forms/event.py
+++ b/src/pretix/control/forms/event.py
@@ -56,7 +56,8 @@ class EventWizardBasicsForm(I18nModelForm):
             'date_from',
             'date_to',
             'presale_start',
-            'presale_end'
+            'presale_end',
+            'location',
         ]
         widgets = {
             'date_from': forms.DateTimeInput(attrs={'class': 'datetimepicker'}),
@@ -131,6 +132,7 @@ class EventUpdateForm(I18nModelForm):
             'is_public',
             'presale_start',
             'presale_end',
+            'location',
         ]
         widgets = {
             'date_from': forms.DateTimeInput(attrs={'class': 'datetimepicker'}),
diff --git a/src/pretix/control/templates/pretixcontrol/event/settings.html b/src/pretix/control/templates/pretixcontrol/event/settings.html
index c6f4528f0..d8c4a6b65 100644
--- a/src/pretix/control/templates/pretixcontrol/event/settings.html
+++ b/src/pretix/control/templates/pretixcontrol/event/settings.html
@@ -11,6 +11,7 @@
             {% bootstrap_field form.slug layout="horizontal" %}
             {% bootstrap_field form.date_from layout="horizontal" %}
             {% bootstrap_field form.date_to layout="horizontal" %}
+            {% bootstrap_field form.location layout="horizontal" %}
             {% bootstrap_field form.currency layout="horizontal" %}
             {% bootstrap_field form.is_public layout="horizontal" %}
         </fieldset>
diff --git a/src/pretix/control/templates/pretixcontrol/events/create_basics.html b/src/pretix/control/templates/pretixcontrol/events/create_basics.html
index 875d57532..4af38085d 100644
--- a/src/pretix/control/templates/pretixcontrol/events/create_basics.html
+++ b/src/pretix/control/templates/pretixcontrol/events/create_basics.html
@@ -8,6 +8,7 @@
         {% bootstrap_field form.slug layout="horizontal" %}
         {% bootstrap_field form.date_from layout="horizontal" %}
         {% bootstrap_field form.date_to layout="horizontal" %}
+        {% bootstrap_field form.location layout="horizontal" %}
         {% bootstrap_field form.currency layout="horizontal" %}
     </fieldset>
     <fieldset>