diff --git a/django/contrib/contenttypes/tests.py b/django/contrib/contenttypes/tests.py index 0efc5222c0..e9caa20cf2 100644 --- a/django/contrib/contenttypes/tests.py +++ b/django/contrib/contenttypes/tests.py @@ -151,14 +151,14 @@ class ContentTypesTests(TestCase): self.assertEqual(concrete_model_ct, ContentType.objects.get_for_model(DeferredConcreteModel, for_concrete_model=False)) - + self.assertEqual(concrete_model_ct, ContentType.objects.get_for_model(DeferredProxyModel)) self.assertEqual(proxy_model_ct, ContentType.objects.get_for_model(DeferredProxyModel, for_concrete_model=False)) - + def test_get_for_concrete_models(self): """ Make sure the `for_concrete_models` kwarg correctly works @@ -185,7 +185,7 @@ class ContentTypesTests(TestCase): ConcreteModel.objects.create(name="Concrete") DeferredConcreteModel = ConcreteModel.objects.only('pk').get().__class__ DeferredProxyModel = ProxyModel.objects.only('pk').get().__class__ - + cts = ContentType.objects.get_for_models(DeferredConcreteModel, DeferredProxyModel) self.assertEqual(cts, { @@ -200,7 +200,7 @@ class ContentTypesTests(TestCase): DeferredConcreteModel: concrete_model_ct, DeferredProxyModel: proxy_model_ct, }) - + def test_shortcut_view(self): """ diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt index 1e9e21a4b7..0226435159 100644 --- a/docs/ref/contrib/contenttypes.txt +++ b/docs/ref/contrib/contenttypes.txt @@ -226,15 +226,15 @@ lookup:: .. versionadded:: 1.5 -Prior to Django 1.5 :meth:`~ContentTypeManager.get_for_model()` and -:meth:`~ContentTypeManager.get_for_models()` always returned the -:class:`~django.contrib.contenttypes.models.ContentType` associated with the -concrete model of the specified one(s). That means there was no way to retreive -the :class:`~django.contrib.contenttypes.models.ContentType` of a proxy model -using those methods. As of Django 1.5 you can now pass a boolean flag – +Prior to Django 1.5 :meth:`~ContentTypeManager.get_for_model()` and +:meth:`~ContentTypeManager.get_for_models()` always returned the +:class:`~django.contrib.contenttypes.models.ContentType` associated with the +concrete model of the specified one(s). That means there was no way to retreive +the :class:`~django.contrib.contenttypes.models.ContentType` of a proxy model +using those methods. As of Django 1.5 you can now pass a boolean flag – respectively ``for_concrete_model`` and ``for_concrete_models`` – to specify -wether or not you want to retreive the -:class:`~django.contrib.contenttypes.models.ContentType` for the concrete or +wether or not you want to retreive the +:class:`~django.contrib.contenttypes.models.ContentType` for the concrete or direct model. Generic relations diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt index 575bd8d0f8..6512560b50 100644 --- a/docs/releases/1.5.txt +++ b/docs/releases/1.5.txt @@ -72,11 +72,11 @@ tag's content. Retreival of ``ContentType`` instances associated with proxy models ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The methods :meth:`ContentTypeManager.get_for_model() ` -and :meth:`ContentTypeManager.get_for_models() ` -have a new keyword argument – respectively ``for_concrete_model`` and ``for_concrete_models``. +The methods :meth:`ContentTypeManager.get_for_model() ` +and :meth:`ContentTypeManager.get_for_models() ` +have a new keyword argument – respectively ``for_concrete_model`` and ``for_concrete_models``. By passing ``False`` using this argument it is now possible to retreive the -:class:`ContentType ` +:class:`ContentType ` associated with proxy models. Minor features