Hopiu/django-categories
1
0
Fork 0
mirror of https://github.com/jazzband/django-categories.git synced 2026-03-16 22:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Renamed get_query_set to get_queryset to get Django categories to work in Django 1.7. I'm not sure of a good way to make this work in Django 1.6.

Browse source
This commit is contained in:
Brent O'Connor 2014-09-12 09:58:27 -05:00 committed by Corey Oordt
parent 77d0903d59
commit 58abcc7401
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
categories/base.py
View file

@ -26,7 +26,7 @@ class CategoryManager(models.Manager):
"""
Only categories that are active
"""
return self.get_query_set().filter(active=True)
return self.get_queryset().filter(active=True)
class CategoryBase(MPTTModel):

10
categories/editor/tree_editor.py
View file

@ -80,8 +80,8 @@ class TreeChangeList(ChangeList):
else:
return []
def get_query_set(self, *args, **kwargs):
qs = super(TreeChangeList, self).get_query_set(*args, **kwargs).order_by('tree_id', 'lft')
def get_queryset(self, *args, **kwargs):
qs = super(TreeChangeList, self).get_queryset(*args, **kwargs).order_by('tree_id', 'lft')
return qs
@ -171,7 +171,7 @@ class TreeEditor(admin.ModelAdmin):
# Try to look up an action first, but if this isn't an action the POST
# will fall through to the bulk edit check, below.
if actions and request.method == 'POST':
response = self.response_action(request, queryset=cl.get_query_set())
response = self.response_action(request, queryset=cl.get_queryset())
if response:
return response
@ -276,11 +276,11 @@ class TreeEditor(admin.ModelAdmin):
else:
return self.old_changelist_view(request, extra_context)
def queryset(self, request):
def get_queryset(self, request):
"""
Returns a QuerySet of all model instances that can be edited by the
admin site. This is used by changelist_view.
"""
qs = self.model._default_manager.get_query_set()
qs = self.model._default_manager.get_queryset()
qs.__class__ = TreeEditorQuerySet
return qs

4
categories/models.py
View file

@ -106,14 +106,14 @@ class CategoryRelationManager(models.Manager):
"""
Get all the items of the given content type related to this item.
"""
qs = self.get_query_set()
qs = self.get_queryset()
return qs.filter(content_type__name=content_type)
def get_relation_type(self, relation_type):
"""
Get all the items of the given relationship type related to this item.
"""
qs = self.get_query_set()
qs = self.get_queryset()
return qs.filter(relation_type=relation_type)