2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

more filter features

Browse source
This commit is contained in:
Laura Klünder 2017-06-15 01:11:55 +02:00
parent 5f40d7024d
commit 5d783e86c4
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/c3nav/editor/wrappers.py
View file

@ -261,8 +261,14 @@ class BaseQueryWrapper(BaseWrapper):
new_lookups.append(Prefetch(lookup, qs)) new_lookups.append(Prefetch(lookup, qs))
return self._wrap_queryset(self.get_queryset().prefetch_related(*new_lookups)) return self._wrap_queryset(self.get_queryset().prefetch_related(*new_lookups))
def get(self, **kwargs): def get(self, *args, **kwargs):
return self._wrap_instance(self.get_queryset().get(**kwargs)) print(args, kwargs)
results = tuple(self.filter(*args, **kwargs))
if len(results) == 1:
return self._wrap_instance(results[0])
if results:
raise self._obj.model.DoesNotExist
raise self._obj.model.MultipleObjectsReturned
def order_by(self, *args): def order_by(self, *args):
return self._wrap_queryset(self.get_queryset().order_by(*args)) return self._wrap_queryset(self.get_queryset().order_by(*args))
@ -287,8 +293,11 @@ class BaseQueryWrapper(BaseWrapper):
q = Q(**{filter_name: filter_value}) q = Q(**{filter_name: filter_value})
if field_name == 'pk': if field_name == 'pk' or field_name == self._obj.model._meta.pk.name:
return q if not segments:
return q
else:
return q
if isinstance(class_value, ForwardManyToOneDescriptor): if isinstance(class_value, ForwardManyToOneDescriptor):
if not segments: if not segments:
@ -306,6 +315,9 @@ class BaseQueryWrapper(BaseWrapper):
segments = ['in'] segments = ['in']
q = Q(**{filter_name: filter_value}) q = Q(**{filter_name: filter_value})
if filter_type == self._obj.model._meta.get_field(field_name).model._meta.pk.name:
filter_type = 'pk'
if filter_type == 'pk' and segments == ['in']: if filter_type == 'pk' and segments == ['in']:
return self._filter_values(q, field_name, lambda val: val in filter_value) return self._filter_values(q, field_name, lambda val: val in filter_value)