Ticket #9071: disable_add_r15922.diff

docs/ref/contrib/admin/index.txt

@@ -261 +261 @@
             ``django.utils.html.escape()`` to escape any HTML special
             characters.
 
+.. attribute:: ModelAdmin.exclude_add
+
+    Disable the related field "add another" popup for any field listed. 
+
+    For example::
+
+    class BookAdmin(admin.ModelAdmin):
+        exclude_add = ['author']
+
+    In the admin form for the Book model, the author field will appear without
+    the popup link next to it.
+
 .. attribute:: ModelAdmin.filter_horizontal
 
     By default, a :class:`~django.db.models.ManyToManyField` is displayed in

tests/regressiontests/admin_views/tests.py

@@ -116 +116 @@
         response = self.client.post('/test_admin/%s/admin_views/section/add/' % self.urlbit, post_data)
         self.assertEqual(response.status_code, 302) # redirect somewhere
 
+    def testExcludeAdd(self):
+        """
+        Test if we can disable "add" popup links in the admin
+        """
+        response = self.client.get(reverse('admin:admin_views_answer_add'))
+        self.assertNotContains(response, """<a href="/test_admin/admin/admin_views/question/add/" class="add-another" id="add_id_question" onclick="return showAddAnotherPopup(this);"> <img src="/static/admin/img/admin/icon_addlink.gif" width="10" height="10" alt="Add Another"/></a>""")
+
     def testPopupAddPost(self):
         """
         Ensure http response from a popup is properly escaped.

tests/regressiontests/admin_views/models.py

@@ -676 +676 @@
     def __unicode__(self):
         return self.answer
 
+class AnswerAdmin(admin.ModelAdmin):
+    exclude_add = ['question']
+
 class Reservation(models.Model):
     start_date = models.DateTimeField()
     price = models.IntegerField()
@@ -817 +820 @@
 admin.site.register(Topping)
 admin.site.register(Album, AlbumAdmin)
 admin.site.register(Question)
-admin.site.register(Answer)
+admin.site.register(Answer, AnswerAdmin)

django/contrib/admin/options.py

@@ -70 +70 @@
     formfield_overrides = {}
     readonly_fields = ()
     ordering = None
+    exclude_add = []
 
     def __init__(self):
         overrides = FORMFIELD_FOR_DBFIELD_DEFAULTS.copy()
@@ -113 +114 @@
                 related_modeladmin = self.admin_site._registry.get(
                                                             db_field.rel.to)
                 can_add_related = bool(related_modeladmin and
-                            related_modeladmin.has_add_permission(request))
+                            related_modeladmin.has_add_permission(request) and
+                            db_field.name not in self.exclude_add)
                 formfield.widget = widgets.RelatedFieldWidgetWrapper(
                             formfield.widget, db_field.rel, self.admin_site,
                             can_add_related=can_add_related)