From 6dd782e9e7846a41702a045f7a7813d0bb76705e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 22 Sep 2017 20:01:53 +0200 Subject: Django 1.11: update widgets with flatatt management --- chimere/widgets.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/chimere/widgets.py b/chimere/widgets.py index c184eb1..66bbc5a 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -28,10 +28,11 @@ from django.conf import settings 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, flatatt +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 import re @@ -171,7 +172,7 @@ class ButtonRadioInput(RadioSelect): return mark_safe('%s %s' % ( self.tag(name, value, idx), label_for, choice_label)) - +""" class ButtonRadioFieldRenderer(RadioFieldRenderer): def __iter__(self): for i, choice in enumerate(self.choices): @@ -181,12 +182,15 @@ class ButtonRadioFieldRenderer(RadioFieldRenderer): return mark_safe('\n'.join([ w.render(self.name, self.value, index=idx) for idx, w in enumerate(self)])) +""" class ButtonSelectWidget(forms.RadioSelect): + """ def __init__(self, *args, **kwargs): self.renderer = ButtonRadioFieldRenderer super(ButtonSelectWidget, self).__init__(*args, **kwargs) + """ def render(self, *args, **kwargs): rendered = "
\n" % kwargs['attrs']['id'] @@ -403,7 +407,8 @@ class PointChooserWidget(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, renderer=None, area_name='', + initialized=True): """ Render a map and latitude, longitude information field """ -- cgit v1.2.3