Merge branch 'master' into gender_options

core/views/forms.py

@@ -42,6 +42,10 @@ from django.utils.translation import ugettext
 from phonenumber_field.widgets import PhoneNumberInternationalFallbackWidget
 from ajax_select.fields import AutoCompleteSelectField
 from ajax_select import make_ajax_field
+from django.utils.dateparse import parse_datetime
+from django.utils import timezone
+import datetime
+from django.forms.utils import to_current_timezone
 
 import re
 
@@ -114,14 +118,11 @@ class SelectFile(TextInput):
             attrs["class"] = "select_file"
         else:
             attrs = {"class": "select_file"}
-        output = (
-            '%(content)s<div name="%(name)s" class="choose_file_widget" title="%(title)s"></div>'
-            % {
-                "content": super(SelectFile, self).render(name, value, attrs, renderer),
-                "title": _("Choose file"),
-                "name": name,
-            }
-        )
+        output = '%(content)s<div name="%(name)s" class="choose_file_widget" title="%(title)s"></div>' % {
+            "content": super(SelectFile, self).render(name, value, attrs, renderer),
+            "title": _("Choose file"),
+            "name": name,
+        }
         output += (
             '<span name="'
             + name
@@ -138,14 +139,11 @@ class SelectUser(TextInput):
             attrs["class"] = "select_user"
         else:
             attrs = {"class": "select_user"}
-        output = (
-            '%(content)s<div name="%(name)s" class="choose_user_widget" title="%(title)s"></div>'
-            % {
-                "content": super(SelectUser, self).render(name, value, attrs, renderer),
-                "title": _("Choose user"),
-                "name": name,
-            }
-        )
+        output = '%(content)s<div name="%(name)s" class="choose_user_widget" title="%(title)s"></div>' % {
+            "content": super(SelectUser, self).render(name, value, attrs, renderer),
+            "title": _("Choose user"),
+            "name": name,
+        }
         output += (
             '<span name="'
             + name
@@ -399,3 +397,26 @@ class GiftForm(forms.ModelForm):
                 id=user_id
             )
             self.fields["user"].widget = forms.HiddenInput()
+
+
+class TzAwareDateTimeField(forms.DateTimeField):
+    def __init__(
+        self, input_formats=["%Y-%m-%d %H:%M:%S"], widget=SelectDateTime, **kwargs
+    ):
+        super().__init__(input_formats=input_formats, widget=widget, **kwargs)
+
+    def prepare_value(self, value):
+        # the db value is a datetime as a string in UTC
+        if isinstance(value, str):
+            # convert it into a naive datetime (no timezone attached)
+            value = parse_datetime(value)
+            # attach it to the UTC timezone (so that to_current_timezone()
+            # converts it to the local timezone)
+            value = timezone.make_aware(value, timezone.utc)
+
+        if isinstance(value, datetime.datetime):
+            value = to_current_timezone(value)
+            # otherwise it is formatted according to locale (in french)
+            value = str(value)
+
+        return value