Skip to content

Commit

Permalink
fix: wtforms compat on 3.1.0 (#2138)
Browse files Browse the repository at this point in the history
* fix: WTForms compat with 3.1.0

* fix for multiple also
  • Loading branch information
dpgaspar authored Oct 16, 2023
1 parent 5f30fd7 commit 56fe5d8
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions flask_appbuilder/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

import operator

from packaging import version
import wtforms
from wtforms import widgets
from wtforms.fields import Field, SelectField, SelectFieldBase
from wtforms.validators import ValidationError

IS_WTFORMS_LESS_THEN_3_1_0 = version.parse(wtforms.__version__) < version.parse("3.1.0")


class AJAXSelectField(Field):
"""
Expand Down Expand Up @@ -130,10 +134,16 @@ def _get_object_list(self):

def iter_choices(self):
if self.allow_blank:
yield ("__None", self.blank_text, self.data is None)
if IS_WTFORMS_LESS_THEN_3_1_0:
yield ("__None", self.blank_text, self.data is None)
else:
yield ("__None", self.blank_text, self.data is None, {})

for pk, obj in self._get_object_list():
yield (pk, self.get_label(obj), obj == self.data)
if IS_WTFORMS_LESS_THEN_3_1_0:
yield (pk, self.get_label(obj), obj == self.data)
else:
yield (pk, self.get_label(obj), obj == self.data, {})

def process_formdata(self, valuelist):
if valuelist:
Expand Down Expand Up @@ -203,7 +213,10 @@ def _set_data(self, data):

def iter_choices(self):
for pk, obj in self._get_object_list():
yield (pk, self.get_label(obj), obj in self.data)
if IS_WTFORMS_LESS_THEN_3_1_0:
yield (pk, self.get_label(obj), obj in self.data)
else:
yield (pk, self.get_label(obj), obj in self.data, {})

def process_formdata(self, valuelist):
self._formdata = set(valuelist)
Expand Down

0 comments on commit 56fe5d8

Please sign in to comment.