diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-12-02 18:10:07 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-12-02 18:10:07 +0000 |
| commit | 5e5768ae83f3950720921f25a473b39890528661 (patch) | |
| tree | 35060863337ea8f5badfe1594f215a5bfdeab0a7 /django/db/models/options.py | |
| parent | 4ac8ba18559ab352e06a553df5ef49244b72413c (diff) | |
Fixed #3323 -- More robust error handling for related objetcs. Thanks, Greg
Kopka and shaleh.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/options.py')
| -rw-r--r-- | django/db/models/options.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/options.py b/django/db/models/options.py index 23d9b04fe9..37ace0a7c1 100644 --- a/django/db/models/options.py +++ b/django/db/models/options.py @@ -152,7 +152,7 @@ class Options(object): rel_objs = [] for klass in get_models(): for f in klass._meta.fields: - if f.rel and self == f.rel.to._meta: + if f.rel and not isinstance(f.rel.to, str) and self == f.rel.to._meta: rel_objs.append(RelatedObject(f.rel.to, klass, f)) self._all_related_objects = rel_objs return rel_objs @@ -186,7 +186,7 @@ class Options(object): rel_objs = [] for klass in get_models(): for f in klass._meta.many_to_many: - if f.rel and self == f.rel.to._meta: + if f.rel and not isinstance(f.rel.to, str) and self == f.rel.to._meta: rel_objs.append(RelatedObject(f.rel.to, klass, f)) if app_cache_ready(): self._all_related_many_to_many_objects = rel_objs |