Author: carljm
Date: 2011-04-27 10:51:43 -0700 (Wed, 27 Apr 2011)
New Revision: 16108
Modified:
django/trunk/django/db/models/options.py
django/trunk/tests/regressiontests/app_loading/not_installed/models.py
django/trunk/tests/regressiontests/app_loading/tests.py
Log:
Refs #15093 -- Fixed another get_models call missed in r16053. Thanks Luke for
catching it.
Modified: django/trunk/django/db/models/options.py
===================================================================
--- django/trunk/django/db/models/options.py 2011-04-27 15:47:16 UTC (rev
16107)
+++ django/trunk/django/db/models/options.py 2011-04-27 17:51:43 UTC (rev
16108)
@@ -420,7 +420,7 @@
cache[obj] = parent
else:
cache[obj] = model
- for klass in get_models():
+ for klass in get_models(only_installed=False):
for f in klass._meta.local_many_to_many:
if f.rel and not isinstance(f.rel.to, str) and self ==
f.rel.to._meta:
cache[RelatedObject(f.rel.to, klass, f)] = None
Modified: django/trunk/tests/regressiontests/app_loading/not_installed/models.py
===================================================================
--- django/trunk/tests/regressiontests/app_loading/not_installed/models.py
2011-04-27 15:47:16 UTC (rev 16107)
+++ django/trunk/tests/regressiontests/app_loading/not_installed/models.py
2011-04-27 17:51:43 UTC (rev 16108)
@@ -7,3 +7,7 @@
class RelatedModel(models.Model):
not_installed = models.ForeignKey(NotInstalledModel)
+
+
+class M2MRelatedModel(models.Model):
+ not_installed = models.ManyToManyField(NotInstalledModel)
Modified: django/trunk/tests/regressiontests/app_loading/tests.py
===================================================================
--- django/trunk/tests/regressiontests/app_loading/tests.py 2011-04-27
15:47:16 UTC (rev 16107)
+++ django/trunk/tests/regressiontests/app_loading/tests.py 2011-04-27
17:51:43 UTC (rev 16108)
@@ -122,4 +122,4 @@
from .not_installed.models import NotInstalledModel
self.assertEqual(
set(NotInstalledModel._meta.get_all_field_names()),
- set(["id", "relatedmodel"]))
+ set(["id", "relatedmodel", "m2mrelatedmodel"]))
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
