Ticket #6779: inline_delete_only_existing.diff

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

@@ -6 +6 @@
 {% for inline_admin_form in inline_admin_formset %}
 <div class="inline-related {% if forloop.last %}last-related{% endif %}">
   <h2><b>{{ inline_admin_formset.opts.verbose_name|title }}:</b>&nbsp;{% if inline_admin_form.original %}{{ inline_admin_form.original }}{% else %} #{{ forloop.counter }}{% endif %}
-    {% if inline_admin_formset.formset.deletable %}<span class="delete">{{ inline_admin_form.deletion_field.field }} {{ inline_admin_form.deletion_field.label_tag }}</span>{% endif %}
+    {% if inline_admin_formset.formset.deletable 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>

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

@@ -13 +13 @@
      {% endfor %}
      {% if inline_admin_formset.formset.deletable %}<th>{% trans "Delete" %}?</th>{% endif %}
      </tr></thead>
-   
+
      {% for inline_admin_form in inline_admin_formset %}
-                   
+
         <tr class="{% cycle row1,row2 %} {% if inline_admin_form.original or inline_admin_form.show_url %}has_original{% endif %}">
 
         <td class="original">{% if inline_admin_form.original or inline_admin_form.show_url %}<p>
@@ -44 +44 @@
             {% endfor %}
           {% endfor %}
         {% endfor %}
-                
-        {% if inline_admin_formset.formset.deletable %}<td class="delete">{{ inline_admin_form.deletion_field.field }}</td>{% endif %}
-        
+
+        {% if inline_admin_formset.formset.deletable %}<td class="delete">{% if inline_admin_form.original %}{{ inline_admin_form.deletion_field.field }}{% endif %}</td>{% endif %}
+
         </tr>
 
      {% endfor %}
-   
+
    </table>
-   
+
 </fieldset>
   </div>
-  
+
   {# <ul class="tools"> #}
   {#   <li><a class="add" href="">Add another {{ inline_admin_formset.opts.verbose_name|title }}</a></li> #}
   {# </ul> #}
-  
+
 </div>