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

correct treatment of core_filters in Wrappers

Browse source
This commit is contained in:
Laura Klünder 2017-06-17 23:59:55 +02:00
parent bd32896b95
commit 56284038c2
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -588,25 +588,27 @@ class BaseQueryWrapper(BaseWrapper):
class ManagerWrapper(BaseQueryWrapper):
def get_queryset(self):
return self._obj.exclude(pk__in=self._changeset.deleted_existing.get(self._obj.model, ()))
return super().get_queryset().exclude(pk__in=self._changeset.deleted_existing.get(self._obj.model, ()))
class RelatedManagerWrapper(ManagerWrapper):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
new = self.filter(**self._obj.core_filters)
self._created_pks = new._created_pks
def _get_cache_name(self):
return self._obj.field.related_query_name()
def get_queryset(self):
return self.model.objects.filter(**self._obj.core_filters)
return super().get_queryset().filter(**self._obj.core_filters)
def all(self):
try:
return self.instance._prefetched_objects_cache[self._get_cache_name()]
except(AttributeError, KeyError):
pass
return self.get_queryset().all()
return super().all()
def create(self, *args, **kwargs):
kwargs[self._obj.field.name] = self.instance
@ -621,9 +623,6 @@ class ManyRelatedManagerWrapper(RelatedManagerWrapper):
def _get_cache_name(self):
return self._obj.prefetch_cache_name
def get_queryset(self):
return self.model.objects.filter(**self._obj.core_filters)
def set(self, objs, author=None):
if author is None:
author = self._author
@ -655,7 +654,7 @@ class ManyRelatedManagerWrapper(RelatedManagerWrapper):
return self.instance._prefetched_objects_cache[self._get_cache_name()]
except(AttributeError, KeyError):
pass
return self.get_queryset().all()
return super().all()
def create(self, *args, **kwargs):
raise NotImplementedError