diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-09-28 17:28:20 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:20:58 +0100 |
| commit | 716d0c3ea5ddcffdd3c50464b7f6dc21516c4f69 (patch) | |
| tree | 44253a54855244873363b5605468584952bfdb6a | |
| parent | 2d713b0230c0be9b89d23dfde36423027a72309e (diff) | |
| download | Ishtar-716d0c3ea5ddcffdd3c50464b7f6dc21516c4f69.tar.bz2 Ishtar-716d0c3ea5ddcffdd3c50464b7f6dc21516c4f69.zip | |
Migration to Django 2.2 - fix media for select2
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/default_wizard.html | 1 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index c279a37e0..249d4c4ce 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -13,7 +13,6 @@ {% block wizard_form %} <form action="." class='wizard-form' id="wizard-form" method="post" name='wizard'{% if wizard.form.file_upload %} enctype="multipart/form-data"{% endif %}>{% csrf_token %} <div class='form{% if not form.SEARCH_AND_SELECT %} container{% endif %}'> -{{ wizard.form.media }} {{ wizard.management_form }} {% block form_head %}{% endblock %} {% block form_detail %} diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index ddc4eb913..29165232a 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -120,16 +120,14 @@ class SelectReadonlyField(forms.ChoiceField): return bool(self.get_q().filter(pk=value).count()) -class Select2Media(object): +class Select2Media: @property def media(self): - media = super(Select2Media, self).media css = {"all": ("select2/css/select2.css",)} js = ["select2/js/select2.full.min.js"] for lang_code, lang in settings.LANGUAGES: js.append("select2/js/i18n/{}.js".format(lang_code)) - media.add_css(css) - media.add_js(js) + media = forms.Media(css=css, js=js) return media |