diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-08-30 17:03:15 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-08-30 17:03:15 +0000 |
| commit | e1f0accaf6ca331fd9b1bcca2faedd47033ff95e (patch) | |
| tree | 9a62b933b1118c2da99a6f6df9c51cd189e1a57c /django/views | |
| parent | 02ebeec0dc719bdbbe2ecfa1fe6655a6289fc931 (diff) | |
Fixed display bug in admin when deleting an object that has a OneToOneField
git-svn-id: http://code.djangoproject.com/svn/django/trunk@577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/views')
| -rw-r--r-- | django/views/admin/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/views/admin/main.py b/django/views/admin/main.py index 17bfa12d8b..a8ac411180 100644 --- a/django/views/admin/main.py +++ b/django/views/admin/main.py @@ -775,7 +775,7 @@ def add_stage(request, app_label, module_name, show_delete=False, form_url='', p new_data.setlist(f.name, new_data[f.name].split(",")) manipulator.do_html2python(new_data) new_object = manipulator.save(new_data) - pk_value = getattr(new_object, opts.pk.name) + pk_value = getattr(new_object, opts.pk.column) log.log_action(request.user.id, opts.get_content_type_id(), pk_value, repr(new_object), log.ADDITION) msg = 'The %s "%s" was added successfully.' % (opts.verbose_name, new_object) # Here, we distinguish between different save types by checking for @@ -1013,7 +1013,7 @@ def _get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current # Display a link to the admin page. nh(deleted_objects, current_depth, ['%s: <a href="../../../../%s/%s/%s/">%r</a>' % \ (capfirst(rel_opts.verbose_name), rel_opts.app_label, rel_opts.module_name, - getattr(sub_obj, rel_opts.pk.name), sub_obj), []]) + getattr(sub_obj, rel_opts.pk.column), sub_obj), []]) _get_deleted_objects(deleted_objects, perms_needed, user, sub_obj, rel_opts, current_depth+2) else: has_related_objs = False |