Skip to content
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

Jump to bottom

bug fix with related fields #74

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

bug fix with related fields #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 33 additions & 6 deletions advanced_filters/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
from django.utils.text import capfirst

import django
import re

from .models import AdvancedFilter
from .form_helpers import CleanWhiteSpacesMixin, VaryingTypeCharField
Expand All @@ -53,6 +54,9 @@ def date_to_string(timestamp):

class AdvancedFilterQueryForm(CleanWhiteSpacesMixin, forms.Form):
""" Build the query from field, operator and value """
ADDITIONAL_OPERATORS = (
("in", _("In")),
)
OPERATORS = (
("iexact", _("Equals")),
("icontains", _("Contains")),
Expand Down Expand Up @@ -94,21 +98,42 @@ def _build_field_choices(self, fields):
key=lambda f: f[1].lower())
) + self.FIELD_CHOICES

def _build_query_dict(self, formdata=None):
def _build_query_dict(self, formdata=None, model=None):
"""
Take submitted data from form and create a query dict to be
used in a Q object (or filter)
"""
if self.is_valid() and formdata is None:
formdata = self.cleaned_data
key = "{field}__{operator}".format(**formdata)

value = formdata['value']

key = "{field}__{operator}".format(
field=formdata['field'],
operator=formdata['operator']
)

if formdata['operator'] == "isnull":
return {key: None}
elif formdata['operator'] == "istrue":
return {formdata['field']: True}
elif formdata['operator'] == "isfalse":
return {formdata['field']: False}
return {key: formdata['value']}
elif model \
and model._meta.get_field(formdata['field']).rel is not None \
and formdata['operator'] in ['iexact', 'icontains', 'iregex']:

value = re.findall(r'(\d+)', value)

if len(value) > 1:
key = "{field}__in".format(
field=formdata['field'],
)
elif len(value) == 1:
value = value[0]
key = formdata['field']

return {key: value}

@staticmethod
def _parse_query_dict(query_data, model):
Expand All @@ -124,7 +149,8 @@ def _parse_query_dict(query_data, model):
if len(parts) < 2:
field = parts[0]
else:
if parts[-1] in dict(AdvancedFilterQueryForm.OPERATORS).keys():
if parts[-1] in dict(AdvancedFilterQueryForm.OPERATORS).keys() \
or parts[-1] in dict(AdvancedFilterQueryForm.ADDITIONAL_OPERATORS).keys():
field = '__'.join(parts[:-1])
operator = parts[-1]
else:
Expand Down Expand Up @@ -181,8 +207,9 @@ def clean(self):

def make_query(self, *args, **kwargs):
""" Returns a Q object from the submitted form """
model = kwargs.get('model')
query = Q() # initial is an empty query
query_dict = self._build_query_dict(self.cleaned_data)
query_dict = self._build_query_dict(self.cleaned_data, model)
if 'negate' in self.cleaned_data and self.cleaned_data['negate']:
query = query & ~Q(**query_dict)
else:
Expand Down Expand Up @@ -354,7 +381,7 @@ def generate_query(self):
ORed.append(query)
query = Q()
else:
query = query & form.make_query()
query = query & form.make_query(model=self._model)
if ORed:
if query: # add last query for OR if any
ORed.append(query)
Expand Down