Skip to content

Sync api #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jesusch wants to merge 4 commits into
base: sync-api
Choose a base branch
from
Open

Sync api #10

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3228673
#6 move 'required' to self.extra dict
May 28, 2020
efe9d0b
copied `field` Property from django-filters
May 28, 2020
7fb732a
Merge branch 'master' of github.com:jesusch/django-mongoengine-filter…
May 28, 2020
f3a20d6
no idea why I did this oO
May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 46 additions & 29 deletions django_mongoengine_filter/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,45 +62,62 @@ def __init__(
self.filter = action
self.lookup_type = lookup_type
self.widget = widget
self.required = required
self.extra = kwargs
self.extra.setdefault('required', False)
self.distinct = distinct
self.exclude = exclude

self.creation_counter = Filter.creation_counter
Filter.creation_counter += 1

# FIXME: original field property
# there had been more logic to check lookup types
# django-filters has renamed lookup_type to lookup_expr
# yet in my case using that smaller `field` property from below works as a glance
#
# @property
# def field(self):
# if not hasattr(self, "_field"):
# help_text = _("This is an exclusion filter") if self.exclude else ""
# if self.lookup_type is None or isinstance(
# self.lookup_type, (list, tuple)
# ):
# if self.lookup_type is None:
# lookup = [(x, x) for x in LOOKUP_TYPES]
# else:
# lookup = [
# (x, x) for x in LOOKUP_TYPES if x in self.lookup_type
# ]
# self._field = LookupTypeField(
# self.field_class(
# required=self.required, widget=self.widget, **self.extra
# ),
# lookup,
# required=self.required,
# label=self.label,
# help_text=help_text,
# )
# else:
# self._field = self.field_class(
# required=self.required,
# label=self.label,
# widget=self.widget,
# help_text=help_text,
# **self.extra
# )

# return self._field

@property
def field(self):
if not hasattr(self, "_field"):
help_text = _("This is an exclusion filter") if self.exclude else ""
if self.lookup_type is None or isinstance(
self.lookup_type, (list, tuple)
):
if self.lookup_type is None:
lookup = [(x, x) for x in LOOKUP_TYPES]
else:
lookup = [
(x, x) for x in LOOKUP_TYPES if x in self.lookup_type
]
self._field = LookupTypeField(
self.field_class(
required=self.required, widget=self.widget, **self.extra
),
lookup,
required=self.required,
label=self.label,
help_text=help_text,
)
else:
self._field = self.field_class(
required=self.required,
label=self.label,
widget=self.widget,
help_text=help_text,
**self.extra
)
if not hasattr(self, '_field'):
field_kwargs = self.extra.copy()

# TODO: not available in django_mongoengine_filter
# if settings.DISABLE_HELP_TEXT:
# field_kwargs.pop('help_text', None)

self._field = self.field_class(label=self.label, **field_kwargs)
return self._field

def filter(self, qs, value):
Expand Down