Skip to content

Commit

Permalink
fix wtf new version
Browse files Browse the repository at this point in the history
  • Loading branch information
idocyabra committed Dec 28, 2023
1 parent 52624cc commit f1a6e4f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion flask_mongoengine/pagination/list_field_pagination.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def __init__(
field_name,
page: int,
per_page: int,
total: [int | None] = None,
total=None,
first_page_index: int = 1,
):
"""Allows an array within a document to be paginated.
Expand Down
16 changes: 14 additions & 2 deletions flask_mongoengine/wtf/fields.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,18 @@
]
from typing import Callable, Optional

import wtforms
from flask import json
from mongoengine.queryset import DoesNotExist
from wtforms import fields as wtf_fields
from wtforms import validators as wtf_validators
from wtforms import widgets as wtf_widgets

wtf_version = list(wtforms.__version__.split("."))
new_wtf_version = (int(wtf_version[0]) >= 3 and int(wtf_version[1]) >= 1) or int(
wtf_version[0]
) > 3


def coerce_boolean(value: Optional[str]) -> Optional[bool]:
"""Transform SelectField boolean value from string and in reverse direction."""
Expand Down Expand Up @@ -77,7 +83,10 @@ def iter_choices(self):
iterable of (value, label, selected) tuples.
"""
if self.allow_blank:
yield "__None", self.blank_text, self.data is None
if new_wtf_version:
yield "__None", self.blank_text, self.data is None, self.render_kw or dict()
else:
yield "__None", self.blank_text, self.data is None

if self.queryset is None:
return
Expand All @@ -94,7 +103,10 @@ def iter_choices(self):
selected = obj in self.data
else:
selected = self._is_selected(obj)
yield obj.id, label, selected
if new_wtf_version:
yield obj.id, label, selected, self.render_kw or {}
else:
yield obj.id, label, selected

def process_formdata(self, valuelist):
"""
Expand Down

0 comments on commit f1a6e4f

Please # to comment.