Ticket #7984: admin-inlineviewonsite.diff

django/contrib/admin/options.py

@@ -773 +773 @@
     def __init__(self, formset, form, fieldsets, prepopulated_fields, original):
         self.formset = formset
         self.original = original
+        self.original.content_type_id = ContentType.objects.get_for_model(original).id
         self.show_url = original and hasattr(original, 'get_absolute_url')
         super(InlineAdminForm, self).__init__(form, fieldsets, prepopulated_fields)
 

django/contrib/admin/templates/admin/edit_inline/stacked.html

@@ -10 +10 @@
     {% 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 %}
     </h2>
   {% 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 %}

django/contrib/admin/templates/admin/edit_inline/tabular.html

@@ -21 +21 @@
 
         <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 %}