From 50a238daaba8feb6a1572dd1ec889103da11eae1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 24 Apr 2024 12:16:56 +0200 Subject: Adaptations vers Django version 2.2 --- chimere/widgets.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'chimere/widgets.py') diff --git a/chimere/widgets.py b/chimere/widgets.py index 346e3cf..3ff42d4 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -28,13 +28,13 @@ from django.conf import settings from django.contrib.gis import forms as gis_forms from django.contrib.gis.db import models from django.core.exceptions import ObjectDoesNotExist -from django.core.urlresolvers import reverse from django.forms.widgets import RadioSelect #, RadioFieldRenderer from django.utils.html import conditional_escape, escape from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ from django.forms.utils import flatatt from django.template.loader import render_to_string +from django.urls import reverse if "tinymce" in settings.INSTALLED_APPS: from tinymce.widgets import TinyMCE as Textarea @@ -164,7 +164,7 @@ class ButtonRadioInput(RadioSelect): ' selected="selected"' if selected else '') def render(self, name=None, value=None, attrs=None, choices=(), - index=0): + index=0, renderer=None): attrs = attrs or self.attrs idx = '' if 'id' in self.attrs: @@ -290,7 +290,7 @@ class JQueryAutoComplete(forms.TextInput): kwargs={'property_slug': self.slug}) return "'{}'".format(source) - def render(self, name, value=None, attrs=None): + def render(self, name, value=None, attrs=None, renderer=None): attrs_hidden = self.build_attrs(attrs, name=name) attrs_select = self.build_attrs(attrs) selected_value, rendered_value = "", "" @@ -333,7 +333,7 @@ class NominatimWidget(forms.TextInput): class Media: js = ["%schimere/js/nominatim-widget.js" % settings.STATIC_URL] - def render(self, name, value, attrs=None, area_name=''): + def render(self, name, value, attrs=None, area_name='', renderer=None): dct = {'id': name, 'nominatim_url': settings.NOMINATIM_URL, 'label': _("Street, City, Country")} @@ -456,7 +456,7 @@ class RouteChooserWidget(forms.TextInput): js = BASE_JS def render(self, name, value, attrs=None, area_name='', routefile_id=None, - initialized=True): + initialized=True, renderer=None): # bad initialization if value == 'None': value = '' @@ -539,7 +539,7 @@ class AreaWidget(forms.TextInput): pass return upper_left_lat, upper_left_lon, lower_right_lat, lower_right_lon - def render(self, name, value, attrs=None, initialized=True): + def render(self, name, value, attrs=None, initialized=True, renderer=None): """ Render a map """ @@ -602,7 +602,7 @@ class PolygonChooserWidget(forms.TextInput): css = BASE_CSS js = BASE_JS - def render(self, name, value, attrs=None, area_name='', initialized=True): + def render(self, name, value, attrs=None, area_name='', initialized=True, renderer=None): val = '' if value: val = str(value) @@ -654,7 +654,7 @@ class ImportFiltrWidget(AreaWidget): css = BASE_CSS js = AREA_JS - def render(self, name, value, attrs=None): + def render(self, name, value, attrs=None, renderer=None): """ Render a map """ @@ -739,8 +739,8 @@ class MultiSelectWidget(forms.SelectMultiple): ] js = ['%sjquery/jquery.min.js' % settings.STATIC_URL] + EXTRA_JS - def render(self, name, value, attrs=None): - rendered = super(MultiSelectWidget, self).render(name, value, attrs) + def render(self, name, value, attrs=None, renderer=None): + rendered = super(MultiSelectWidget, self).render(name, value, attrs, renderer=renderer) rendered += """