From e046ed00e790fbb82b43de9404d8ca3955c8de2f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 18 May 2022 16:23:02 +0200 Subject: Migration to Django 2.2 - many fixes - remove redondant permissions - fix missing kwargs for widget and form fields - fix default to callable for model field - quick and dirty fix for datepicker - is_authenticated() -> is_authenticated - fix registration urls - remove six usage (no more python2) --- ishtar_common/widgets.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'ishtar_common/widgets.py') diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index bab6b3e00..e444261d9 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -71,11 +71,11 @@ class SelectReadonly(forms.Select): label = str(i) yield (i.pk, label) - def render(self, name, value, attrs=None, choices=()): + def render(self, name, value, attrs=None, choices=(), renderer=None): if value: self.choices = list(self.get_choices(value)) value = self.choices[0][0] - return super(SelectReadonly, self).render(name, value, attrs) + return super(SelectReadonly, self).render(name, value, attrs, renderer=None) class SelectReadonlyField(forms.ChoiceField): @@ -98,7 +98,14 @@ class SelectReadonlyField(forms.ChoiceField): self.available = kwargs.pop("available") widget = SelectReadonly(model=self.model, available=self.available) super(SelectReadonlyField, self).__init__( - choices, required, widget, label, initial, help_text, *args, **kwargs + choices=choices, + required=required, + widget=widget, + label=label, + initial=initial, + help_text=help_text, + *args, + **kwargs ) def get_q(self): @@ -132,7 +139,7 @@ class Select2DynamicBase(Select2Media): """ MULTIPLE = False - def render(self, name, value, attrs=None, choices=()): + def render(self, name, value, attrs=None, choices=(), renderer=None): choices = choices or getattr(self, "choices", []) if value: values = [value] @@ -170,7 +177,7 @@ class Select2DynamicBase(Select2Media): if self.MULTIPLE: options.append("multiple: 'true'") - html = super(Select2DynamicBase, self).render(name, value, attrs) + html = super(Select2DynamicBase, self).render(name, value, attrs, renderer=None) html += """