Author: brosner
Date: 2008-08-26 13:07:36 -0500 (Tue, 26 Aug 2008)
New Revision: 8586
Modified:
django/trunk/django/contrib/admin/helpers.py
django/trunk/django/contrib/admin/templates/admin/edit_inline/stacked.html
django/trunk/django/contrib/admin/templates/admin/edit_inline/tabular.html
Log:
Fixed #7984 -- 'View on site' links now work in inlines. Thanks philwo for the
report and initial patch by julianb.
Modified: django/trunk/django/contrib/admin/helpers.py
===================================================================
--- django/trunk/django/contrib/admin/helpers.py 2008-08-26 17:44:04 UTC
(rev 8585)
+++ django/trunk/django/contrib/admin/helpers.py 2008-08-26 18:07:36 UTC
(rev 8586)
@@ -5,6 +5,7 @@
from django.utils.safestring import mark_safe
from django.utils.encoding import force_unicode
from django.contrib.admin.util import flatten_fieldsets
+from django.contrib.contenttypes.models import ContentType
class AdminForm(object):
def __init__(self, form, fieldsets, prepopulated_fields):
@@ -114,6 +115,8 @@
def __init__(self, formset, form, fieldsets, prepopulated_fields,
original):
self.formset = formset
self.original = original
+ if original is not None:
+ self.original.content_type_id =
ContentType.objects.get_for_model(original).pk
self.show_url = original and hasattr(original, 'get_absolute_url')
super(InlineAdminForm, self).__init__(form, fieldsets,
prepopulated_fields)
Modified:
django/trunk/django/contrib/admin/templates/admin/edit_inline/stacked.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/edit_inline/stacked.html
2008-08-26 17:44:04 UTC (rev 8585)
+++ django/trunk/django/contrib/admin/templates/admin/edit_inline/stacked.html
2008-08-26 18:07:36 UTC (rev 8586)
@@ -10,7 +10,7 @@
{% if inline_admin_formset.formset.can_delete and
inline_admin_form.original %}<span class="delete">{{
inline_admin_form.deletion_field.field }} {{
inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
</h3>
{% if inline_admin_form.show_url %}
- <p><a href="/r/{{ inline_admin_form.original.content_type_id }}/{{
inline_admin_form.original.id }}/">View on site</a></p>
+ <p><a href="../../../r/{{ inline_admin_form.original.content_type_id }}/{{
inline_admin_form.original.id }}/">View on site</a></p>
{% endif %}
{% for fieldset in inline_admin_form %}
Modified:
django/trunk/django/contrib/admin/templates/admin/edit_inline/tabular.html
===================================================================
--- django/trunk/django/contrib/admin/templates/admin/edit_inline/tabular.html
2008-08-26 17:44:04 UTC (rev 8585)
+++ django/trunk/django/contrib/admin/templates/admin/edit_inline/tabular.html
2008-08-26 18:07:36 UTC (rev 8586)
@@ -22,7 +22,7 @@
<td class="original">
{% if inline_admin_form.original or inline_admin_form.show_url %}<p>
{% if inline_admin_form.original %} {{ inline_admin_form.original
}}{% endif %}
- {% if inline_admin_form.show_url %}<a href="/r/{{
inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id
}}/">View on site</a>{% endif %}
+ {% if inline_admin_form.show_url %}<a href="../../../r/{{
inline_admin_form.original.content_type_id }}/{{ inline_admin_form.original.id
}}/">View on site</a>{% endif %}
</p>{% endif %}
{{ inline_admin_form.pk_field.field }}
{% spaceless %}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
