Merge branch 'master' into gender_options

core/views/__init__.py

@@ -344,19 +344,19 @@ class QuickNotifMixin:
 
 class DetailFormView(SingleObjectMixin, FormView):
     """
-        Class that allow both a detail view and a form view
+    Class that allow both a detail view and a form view
     """
 
     def get_object(self):
         """
-            Get current group from id in url
+        Get current group from id in url
         """
         return self.cached_object
 
     @cached_property
     def cached_object(self):
         """
-            Optimisation on group retrieval
+        Optimisation on group retrieval
         """
         return super(DetailFormView, self).get_object()
 

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

core/views/group.py

@@ -44,7 +44,7 @@ from core.views import CanEditMixin, DetailFormView
 
 class EditMembersForm(forms.Form):
     """
-        Add and remove members from a Group
+    Add and remove members from a Group
     """
 
     def __init__(self, *args, **kwargs):
@@ -66,7 +66,7 @@ class EditMembersForm(forms.Form):
 
     def clean_users_added(self):
         """
-            Check that the user is not trying to add an user already in the group
+        Check that the user is not trying to add an user already in the group
         """
         cleaned_data = super(EditMembersForm, self).clean()
         users_added = cleaned_data.get("users_added", None)
@@ -100,7 +100,7 @@ class GroupListView(CanEditMixin, ListView):
 
 class GroupEditView(CanEditMixin, UpdateView):
     """
-        Edit infos of a Group
+    Edit infos of a Group
     """
 
     model = RealGroup
@@ -111,7 +111,7 @@ class GroupEditView(CanEditMixin, UpdateView):
 
 class GroupCreateView(CanEditMixin, CreateView):
     """
-        Add a new Group
+    Add a new Group
     """
 
     model = RealGroup
@@ -121,8 +121,8 @@ class GroupCreateView(CanEditMixin, CreateView):
 
 class GroupTemplateView(CanEditMixin, DetailFormView):
     """
-        Display all users in a given Group
-        Allow adding and removing users from it
+    Display all users in a given Group
+    Allow adding and removing users from it
     """
 
     model = RealGroup
@@ -156,7 +156,7 @@ class GroupTemplateView(CanEditMixin, DetailFormView):
 
 class GroupDeleteView(CanEditMixin, DeleteView):
     """
-        Delete a Group
+    Delete a Group
     """
 
     model = RealGroup

core/views/site.py

@@ -30,6 +30,7 @@ from django.contrib.auth.decorators import login_required
 from django.utils import html
 from django.views.generic import ListView, TemplateView
 from django.conf import settings
+from django.utils.text import slugify
 
 import json
 
@@ -73,7 +74,18 @@ def notification(request, notif_id):
 
 def search_user(query, as_json=False):
     try:
-        res = SearchQuerySet().models(User).autocomplete(auto=html.escape(query))[:20]
+        # slugify turns everything into ascii and every whitespace into -
+        # it ends by removing duplicate - (so ' - ' will turn into '-')
+        # replace('-', ' ') because search is whitespace based
+        query = slugify(query).replace("-", " ")
+        # TODO: is this necessary?
+        query = html.escape(query)
+        res = (
+            SearchQuerySet()
+            .models(User)
+            .autocomplete(auto=query)
+            .order_by("-last_update")[:20]
+        )
         return [r.object for r in res]
     except TypeError:
         return []