Skip to content
Snippets Groups Projects
Commit 4ba8c32d authored by ynerant's avatar ynerant
Browse files

Merge branch 'fix-django22' into 'dev'

Don't autocomplete members under Django 2.2

See merge request !39
parents 85dce092 6d04b6a6
No related branches found
No related tags found
1 merge request!39Don't autocomplete members under Django 2.2
Pipeline #9361 passed with stages
in 6 minutes and 29 seconds
......@@ -26,7 +26,12 @@ include manage.py
exclude constellation/settings_local.py
# Include documentation
include *.rst
include AUTHORS.rst
include docs/conf.py
include docs/Makefile
include docs/requirements.txt
recursive-include docs *.rst *.png
recursive-exclude docs/_build *.*
# Include metadata files
include .gitlab-ci.yml
......@@ -37,4 +42,3 @@ include tox.ini
# exclude bad stuff
exclude Dockerfile
exclude entrypoint.sh
exclude DANELLO-VILLANI_BDD_specification.txt
from collections import namedtuple
import django
from django import forms
from django.contrib.admin.widgets import AutocompleteSelectMultiple
from django.contrib.auth.forms import UserCreationForm
......@@ -56,9 +57,11 @@ class OrganizationForm(forms.ModelForm):
class Meta:
model = Organization
fields = ('address', 'members',)
widgets = {
'members': AutocompleteSelectMultiple(
field=Organization._meta.get_field('members'),
admin_site=namedtuple('AdminSite', 'name')('member'), # Use local autocomplete view
),
}
if django.VERSION >= (3, ):
widgets = {
'members': AutocompleteSelectMultiple(
field=Organization._meta.get_field('members'),
admin_site=namedtuple('AdminSite', 'name')('member'), # Use local autocomplete view
),
}
import django
from django.contrib import admin
from django.contrib.admin.views.autocomplete import AutocompleteJsonView
from django.urls import path
......@@ -14,6 +15,11 @@ urlpatterns = [
path('validate_email/<uidb64>/<token>/', views.UserValidateView.as_view(), name='email_validation'),
path("impersonate/<int:pk>/", views.UserImpersonateView.as_view(), name="user_impersonate"),
path("reset-impersonate/", views.ResetAdminView.as_view(), name="reset_impersonate"),
# Autocomplete view that don't require to be staff
path("autocomplete/", AutocompleteJsonView.as_view(admin_site=admin.site), name="autocomplete"),
]
if django.VERSION >= (3,):
# Don't use autocompletion for Django 2.2
urlpatterns += [
# Autocomplete view that don't require to be staff
path("autocomplete/", AutocompleteJsonView.as_view(admin_site=admin.site), name="autocomplete"),
]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment