Ticket #2927: fix_admin_add_buttons.patch

django/contrib/admin/templates/widget/foreign.html

@@ -7 +7 @@
-        <a href="{{ bound_field.related_url }}" class="related-lookup" id="lookup_{{ bound_field.element_id }}" onclick="return showRelatedObjectLookupPopup(this);"> <img src="{% admin_media_prefix %}img/admin/selector-search.gif" width="16" height="16" alt="Lookup"></a>
-    {% endif %}
-{% else %}
-
+and has_add_permission 
-    <a href="{{ bound_field.related_url }}add/" class="add-another" id="add_{{ bound_field.element_id }}" onclick="return showAddAnotherPopup(this);"> <img src="{% admin_media_prefix %}img/admin/icon_addlink.gif" width="10" height="10" alt="Add Another"/></a>
-{% endif %}{% endif %}
-{% if change %}

django/contrib/admin/templatetags/admin_modify.py

@@ -42 +42 @@
-        'show_delete_link': (not is_popup and context['has_delete_permission']
-                              and (change or context['show_delete'])),
-        'show_save_as_new': not is_popup and change and opts.admin.save_as,
-
+
+
-        'show_save_and_continue': not is_popup and context['has_change_permission'],
-        'show_save': True
-    }
@@ -95 +96 @@
-    def render(self, context):
-        bound_field = template.resolve_variable(self.bound_field_var, context)
-
+        # Pass through the add permission for related fields.
+        opts = bound_field.field.rel and bound_field.field.rel.to._meta
+        if opts:
+            has_add_permission = context['perms'][opts.app_label][opts.get_add_permission()]
+
-        context.push()
-        context['bound_field'] = bound_field
+        if opts:
+            context['has_add_permission'] = has_add_permission
-
-        output = self.get_nodelist(bound_field.field.__class__).render(context)
-        context.pop()
@@ -239 +247 @@
-    return {
-        'add': context['add'],
-        'change': context['change'],
+        'perms': context['perms'],
-        'bound_fields': bound_fields,
-        'class_names': " ".join(class_names),
-    }

django/contrib/admin/views/auth.py

@@ -30 +30 @@
-        'is_popup': request.REQUEST.has_key('_popup'),
-        'add': True,
-        'change': False,
+        'has_add_permission': True,
-        'has_delete_permission': False,
-        'has_change_permission': True,
-        'has_file_field': False,

django/contrib/admin/views/main.py

@@ -199 +199 @@
-    extra_context = {
-        'add': add,
-        'change': change,
+        'has_add_permission': context['perms'][app_label][opts.get_add_permission()],
-        'has_delete_permission': context['perms'][app_label][opts.get_delete_permission()],
-        'has_change_permission': context['perms'][app_label][opts.get_change_permission()],
-        'has_file_field': opts.has_field_type(models.FileField),