diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2007-02-26 19:12:31 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2007-02-26 19:12:31 +0000 |
| commit | f3cc581f3ae591adf0d2dcf201a3d08e5cddef46 (patch) | |
| tree | d9abe27b0c46f57d077057589fcee415b52e3d07 | |
| parent | cb1ff2af35bd983dadabfbfbc882c326bd22bab5 (diff) | |
Fixed #2828, a TypeError when deleting objects with m2m relations to self. Thanks, Brian Beck.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/contrib/admin/views/main.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 9fae17d5fe..0e962adf18 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -461,9 +461,12 @@ def _get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current opts_seen.append(related.opts) rel_opts_name = related.get_accessor_name() has_related_objs = False - rel_objs = getattr(obj, rel_opts_name, None) - if rel_objs: - has_related_objs = True + + # related.get_accessor_name() could return None for symmetrical relationships + if rel_opts_name: + rel_objs = getattr(obj, rel_opts_name, None) + if rel_objs: + has_related_objs = True if has_related_objs: for sub_obj in rel_objs.all(): |