Changeset 1974
- Timestamp:
- 01/15/06 00:04:29 (3 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/branches/magic-removal/AUTHORS
r1972 r1974 80 80 Nebojša Dorđević 81 81 Sam Newman <http://www.magpiebrain.com/> 82 oggie rob <oz.robharvey@gmail.com> 82 83 pgross@thoughtworks.com 83 84 phaedo <http://phaedo.cx/> django/branches/magic-removal/django/contrib/admin/views/stages/delete.py
r1950 r1974 62 62 # Display a link to the admin page. 63 63 nh(deleted_objects, current_depth, ['%s: <a href="../../../../%s/%s/%s/">%s</a>' % \ 64 (capfirst(related.opts.verbose_name), related.opts.app_label, related.opts.module_name, sub_obj.id, strip_tags(str(sub_obj))), []])64 (capfirst(related.opts.verbose_name), related.opts.app_label, related.opts.module_name, getattr(sub_obj, related.opts.pk.attname), strip_tags(str(sub_obj))), []]) 65 65 _get_deleted_objects(deleted_objects, perms_needed, user, sub_obj, related.opts, current_depth+2) 66 66 # If there were related objects, and the user doesn't have … … 88 88 (_('One or more %(fieldname)s in %(name)s:') % {'fieldname': related.field.name, 'name':related.opts.verbose_name}) + \ 89 89 (' <a href="../../../../%s/%s/%s/">%s</a>' % \ 90 (related.opts.app_label, related.opts.module_name, sub_obj.id, strip_tags(str(sub_obj)))), []])90 (related.opts.app_label, related.opts.module_name, getattr(sub_obj, related.opts.pk.attname), strip_tags(str(sub_obj)))), []]) 91 91 # If there were related objects, and the user doesn't have 92 92 # permission to change them, add the missing perm to perms_needed.
