Changeset 1973
- Timestamp:
- 01/15/06 00:01:35 (3 years ago)
- Files:
-
- django/trunk/AUTHORS (modified) (1 diff)
- django/trunk/django/contrib/admin/views/main.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/AUTHORS
r1970 r1973 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/trunk/django/contrib/admin/views/main.py
r1758 r1973 593 593 # Display a link to the admin page. 594 594 nh(deleted_objects, current_depth, ['%s: <a href="../../../../%s/%s/%s/">%s</a>' % \ 595 (capfirst(related.opts.verbose_name), related.opts.app_label, related.opts.module_name, sub_obj.id, strip_tags(str(sub_obj))), []])595 (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))), []]) 596 596 _get_deleted_objects(deleted_objects, perms_needed, user, sub_obj, related.opts, current_depth+2) 597 597 # If there were related objects, and the user doesn't have … … 619 619 (_('One or more %(fieldname)s in %(name)s:') % {'fieldname': related.field.name, 'name':related.opts.verbose_name}) + \ 620 620 (' <a href="../../../../%s/%s/%s/">%s</a>' % \ 621 (related.opts.app_label, related.opts.module_name, sub_obj.id, strip_tags(str(sub_obj)))), []])621 (related.opts.app_label, related.opts.module_name, getattr(sub_obj, related.opts.pk.attname), strip_tags(str(sub_obj)))), []]) 622 622 # If there were related objects, and the user doesn't have 623 623 # permission to change them, add the missing perm to perms_needed.
