Merge branch 'django_1.7_support' of https://github.com/g3rd/django_polymorphic

Conflicts:
	docs/managers.rst
	polymorphic/admin.py
	polymorphic/manager.py
	polymorphic/tests.py
	runtests.py
This commit is contained in:
Diederik van der Boor
2014-09-22 15:42:35 +02:00
4 changed files with 62 additions and 18 deletions
+4
View File
@@ -31,6 +31,8 @@ Django as automatic manager for several purposes, including accessing
related objects. It must not filter objects and it's safest to use
the plain ``PolymorphicManager`` here.
Note that get_query_set is deprecated in Django 1.8 and creates warnings in Django 1.7.
Manager Inheritance
-------------------
@@ -65,6 +67,8 @@ regarding their start time and ``ArtProject.objects_ordered.most_recent()``
will return the ten most recent art projects.
.
Note that get_query_set is deprecated in Django 1.8 and creates warnings in Django 1.7.
Using a Custom Queryset Class
-----------------------------