encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-12-02 22:44:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

removed support for Q obj

Browse Source
This commit is contained in:
Dev Jones 2012-02-19 00:30:00 -05:00
parent 03951615e1
commit 63660c85f9
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
djangorestframework/mixins.py
View File

@ -35,6 +35,8 @@ __all__ = (
'ListModelMixin', 'ListModelMixin',
'FilterModelMixin', 'FilterModelMixin',
'PaginatorMixin',
) )
@ -676,7 +678,6 @@ class FilterModelMixin(ModelMixin):
queryset = self.get_queryset() queryset = self.get_queryset()
ordering = self.get_ordering() ordering = self.get_ordering()
filter_data = dict(request.GET.items()) filter_data = dict(request.GET.items())
# Get the fields for the resource # Get the fields for the resource
@ -686,26 +687,28 @@ class FilterModelMixin(ModelMixin):
# Iterate over fields and get the field names # Iterate over fields and get the field names
fieldnames = [field.name for field in fields] fieldnames = [field.name for field in fields]
# Fixed query parameters included in the url path. Ex: /resource/<query1>/<query2>/
query_kwargs = self.get_query_kwargs(request, *args, **kwargs)
# Initialize query object # Dynamic query parameters from the url query. Ex: /resource/?color=blue
filter_query = Q() dynamic_query_kwargs = {}
# Check to ensure that each filter key is a valid field in the model # Check to ensure that each filter key is a valid field in the model
for filter_key,value in filter_data.iteritems(): for filter_key,value in filter_data.iteritems():
if filter_key in fieldnames: if filter_key in fieldnames:
new_filter = {filter_key:value} dynamic_query_kwargs[filter_key] = value
new_query = Q(**new_filter)
filter_query = filter_query & new_query
# Combine the query kwargs from the fixed url path and the dynamic url query parameters
filtered_query_kwargs = dict(query_kwargs.items() + dynamic_query_kwargs.items())
# Get a single query using the combined query kwargs
filtered_queryset = queryset.filter(**filtered_query_kwargs)
queryset = queryset.filter(self.build_query(**kwargs)).filter(filter_query)
if ordering: if ordering:
queryset = queryset.order_by(*ordering) filtered_queryset = filtered_queryset.order_by(*ordering)
return queryset return filtered_queryset
########## Pagination Mixins ########## ########## Pagination Mixins ##########