From 7d9e642f24cf40495d9274813eef6041d93b7fb6 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Fri, 14 Jul 2017 17:21:41 +0200
Subject: [PATCH] Useful default date for admission field

---
 src/pretix/control/forms/event.py             |  3 ++-
 src/pretix/static/pretixcontrol/js/ui/main.js | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py
index 1425c0c4a..6a3af5dc5 100644
--- a/src/pretix/control/forms/event.py
+++ b/src/pretix/control/forms/event.py
@@ -179,7 +179,8 @@ class EventUpdateForm(I18nModelForm):
         widgets = {
             'date_from': forms.DateTimeInput(attrs={'class': 'datetimepicker'}),
             'date_to': forms.DateTimeInput(attrs={'class': 'datetimepicker', 'data-date-after': '#id_date_from'}),
-            'date_admission': forms.DateTimeInput(attrs={'class': 'datetimepicker'}),
+            'date_admission': forms.DateTimeInput(attrs={'class': 'datetimepicker',
+                                                         'data-date-default': '#id_date_from'}),
             'presale_start': forms.DateTimeInput(attrs={'class': 'datetimepicker'}),
             'presale_end': forms.DateTimeInput(attrs={'class': 'datetimepicker',
                                                       'data-date-after': '#id_presale_start'}),
diff --git a/src/pretix/static/pretixcontrol/js/ui/main.js b/src/pretix/static/pretixcontrol/js/ui/main.js
index b4ef8eea3..f2e697c37 100644
--- a/src/pretix/static/pretixcontrol/js/ui/main.js
+++ b/src/pretix/static/pretixcontrol/js/ui/main.js
@@ -220,6 +220,19 @@ $(function () {
         earlier_field.on("dp.change", update);
     });
 
+    $(".datetimepicker[data-date-default]").each(function() {
+        var fill_field = $(this),
+            default_field = $($(this).attr("data-date-default")),
+            show = function () {
+                var fill_date = fill_field.data('DateTimePicker').date(),
+                    default_date = default_field.data('DateTimePicker').date();
+                if (fill_date === null) {
+                    fill_field.data("DateTimePicker").defaultDate(default_date);
+                }
+            };
+        fill_field.on("dp.show", show);
+    });
+
     $(".colorpickerfield").colorpicker({
         format: 'hex',
         align: 'left',