diff --git a/core/templates/core/widgets/autocomplete_select.jinja b/core/templates/core/widgets/autocomplete_select.jinja
index 19f1deae..30bc7eb5 100644
--- a/core/templates/core/widgets/autocomplete_select.jinja
+++ b/core/templates/core/widgets/autocomplete_select.jinja
@@ -3,8 +3,8 @@
{% endfor %}
-{% for group_name, group_choices, group_index in widget.optgroups %}{% if group_name %}
+<{{ component }} name="{{ widget.name }}"{% include "django/forms/widgets/attrs.html" %}>{% for group_name, group_choices, group_index in widget.optgroups %}{% if group_name %}
{% endif %}{% endfor %}
-
\ No newline at end of file
+{{ component }}>
\ No newline at end of file
diff --git a/core/views/forms.py b/core/views/forms.py
index 228e4cfe..9c34a003 100644
--- a/core/views/forms.py
+++ b/core/views/forms.py
@@ -81,10 +81,19 @@ class MarkdownInput(Textarea):
class AutoCompleteSelectMixin:
+ component_name = "autocomplete-select"
template_name = "core/widgets/autocomplete_select.jinja"
+ is_ajax = False
+
+ def optgroups(self, name, value, attrs=None):
+ """Don't create option groups when doing ajax"""
+ if self.is_ajax:
+ return []
+ return super().optgroups(name, value, attrs=attrs)
def get_context(self, name, value, attrs):
context = super().get_context(name, value, attrs)
+ context["component"] = self.component_name
context["statics"] = {
"js": staticfiles_storage.url(
"webpack/core/components/ajax-select-index.ts"
@@ -105,6 +114,16 @@ class AutoCompleteSelect(AutoCompleteSelectMixin, Select): ...
class AutoCompleteSelectMultiple(AutoCompleteSelectMixin, SelectMultiple): ...
+class AutoCompleteSelectUser(AutoCompleteSelectMixin, Select):
+ component_name = "user-ajax-select"
+ is_ajax = True
+
+
+class AutoCompleteSelectMultipleUser(AutoCompleteSelectMixin, SelectMultiple):
+ component_name = "user-ajax-select"
+ is_ajax = True
+
+
class NFCTextInput(TextInput):
template_name = "core/widgets/nfc.jinja"
diff --git a/election/views.py b/election/views.py
index c24e044b..4280680a 100644
--- a/election/views.py
+++ b/election/views.py
@@ -1,6 +1,5 @@
from typing import TYPE_CHECKING
-from ajax_select.fields import AutoCompleteSelectField
from django import forms
from django.core.exceptions import PermissionDenied
from django.db import transaction
@@ -13,7 +12,9 @@ from django.views.generic.edit import CreateView, DeleteView, FormView, UpdateVi
from core.views import CanCreateMixin, CanEditMixin, CanViewMixin
from core.views.forms import (
+ AutoCompleteSelect,
AutoCompleteSelectMultiple,
+ AutoCompleteSelectUser,
MarkdownInput,
SelectDateTime,
)
@@ -54,11 +55,15 @@ class CandidateForm(forms.ModelForm):
class Meta:
model = Candidature
fields = ["user", "role", "program", "election_list"]
- widgets = {"program": MarkdownInput}
-
- user = AutoCompleteSelectField(
- "users", label=_("User to candidate"), help_text=None, required=True
- )
+ labels = {
+ "user": _("User to candidate"),
+ }
+ widgets = {
+ "program": MarkdownInput,
+ "user": AutoCompleteSelectUser,
+ "role": AutoCompleteSelect,
+ "election_list": AutoCompleteSelect,
+ }
def __init__(self, *args, **kwargs):
election_id = kwargs.pop("election_id", None)
@@ -100,6 +105,7 @@ class RoleForm(forms.ModelForm):
class Meta:
model = Role
fields = ["title", "election", "description", "max_choice"]
+ widgets = {"election": AutoCompleteSelect}
def __init__(self, *args, **kwargs):
election_id = kwargs.pop("election_id", None)
@@ -123,6 +129,7 @@ class ElectionListForm(forms.ModelForm):
class Meta:
model = ElectionList
fields = ("title", "election")
+ widgets = {"election": AutoCompleteSelect}
def __init__(self, *args, **kwargs):
election_id = kwargs.pop("election_id", None)
@@ -320,6 +327,7 @@ class CandidatureCreateView(CanCreateMixin, CreateView):
"""Verify that the selected user is in candidate group."""
obj = form.instance
obj.election = Election.objects.get(id=self.election.id)
+ obj.user = obj.user if hasattr(obj, "user") else self.request.user
if (obj.election.can_candidate(obj.user)) and (
obj.user == self.request.user or self.can_edit
):