From 886abd8188a3c806a4ea36525f63c09fd118b5f6 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 21 Feb 2020 17:51:00 +0100
Subject: [PATCH] Update django-light-admin, fix conflict between jQuery,
select2 and turbolinks
---
requirements.txt | 2 +-
templates/base.html | 17 +++++------------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 2d377b43..872a451c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ chardet==3.0.4
defusedxml==0.6.0
Django~=2.2
django-allauth==0.39.1
-django-autocomplete-light==3.3.0
+django-autocomplete-light==3.5.1
django-crispy-forms==1.7.2
django-extensions==2.1.9
django-filter==2.2.0
diff --git a/templates/base.html b/templates/base.html
index 448172ac..22c7232d 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -31,18 +31,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
- {# Si un formulaire requiert des données supplémentaires (notamment JS), les données sont chargées #}
- {% if form.media %}
- {{ form.media }}
- {% endif %}
-
- {# Select2 JavaScript #}
- <script type="text/javascript" src="/static/admin/js/vendor/jquery/jquery.js"></script>
- <script type="text/javascript" src="/static/admin/js/vendor/select2/select2.full.js"></script>
- <script type="text/javascript" src="/static/admin/js/vendor/select2/i18n/fr.js"></script>
- <script type="text/javascript" src="/static/admin/js/vendor/select2/i18n/en.js"></script>
- <script type="text/javascript" src="/static/admin/js/vendor/select2/i18n/de.js"></script>
-
{# Bootstrap JavaScript #}
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n"
@@ -59,6 +47,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
src="https://cdnjs.cloudflare.com/ajax/libs/turbolinks/5.2.0/turbolinks.js"
crossorigin="anonymous"></script>
+ {# Si un formulaire requiert des données supplémentaires (notamment JS), les données sont chargées #}
+ {% if form.media %}
+ {{ form.media }}
+ {% endif %}
+
{% block extracss %}{% endblock %}
</head>
<body class="d-flex w-100 h-100 flex-column">
--
GitLab