Ticket #9071: add-r9751.diff

django/contrib/admin/options.py

@@ -39 +39 @@
-    filter_horizontal = ()
-    radio_fields = {}
-    prepopulated_fields = {}
+    exclude_add = []
-    
-    def formfield_for_dbfield(self, db_field, **kwargs):
-        """
@@ -138 +139 @@
-                # formfield can be None if it came from a OneToOneField with
-                # parent_link=True
-                if formfield is not None:
-
+
+
-            return formfield
-        
-        # For any other type of field, just call its formfield() method.

django/contrib/admin/widgets.py

@@ -196 +196 @@
-    This class is a wrapper to a given widget to add the add icon for the
-    admin interface.
-    """
-
+, add=True
-        self.is_hidden = widget.is_hidden
-        self.needs_multipart_form = widget.needs_multipart_form
-        self.attrs = widget.attrs
-        self.choices = widget.choices
-        self.widget = widget
-        self.rel = rel
+        self.add = add
-        # so we can check if the related object is registered with this AdminSite
-        self.admin_site = admin_site
-
@@ -222 +223 @@
-        related_url = '../../../%s/%s/' % (rel_to._meta.app_label, rel_to._meta.object_name.lower())
-        self.widget.choices = self.choices
-        output = [self.widget.render(name, value, *args, **kwargs)]
-
+
+
-            # TODO: "id_" is hard-coded here. This should instead use the correct
-            # API to determine the ID dynamically.
-            output.append(u'<a href="%sadd/" class="add-another" id="add_id_%s" onclick="return showAddAnotherPopup(this);"> ' % \

tests/regressiontests/admin_widgets/models.py

@@ -48 +48 @@
->>> from django.contrib.admin.widgets import FilteredSelectMultiple, AdminSplitDateTime
->>> from django.contrib.admin.widgets import AdminFileWidget, ForeignKeyRawIdWidget, ManyToManyRawIdWidget
->>> from django.contrib.admin.widgets import RelatedFieldWidgetWrapper
+>>> from django.contrib.admin import site 
+>>> from django.forms.widgets import Select as SelectWidget 
-
-Calling conditional_escape on the output of widget.render will simulate what
-happens in the template. This is easier than setting up a template and context
@@ -116 +118 @@
->>> child_of_hidden = Inventory.objects.create(barcode=94, name='Child of hidden', parent=hidden)
->>> print w.render('test', child_of_hidden.parent_id, attrs={}) 
-<input type="text" name="test" value="93" class="vForeignKeyRawIdAdminField" /><a href="../../../admin_widgets/inventory/?t=barcode" class="related-lookup" id="lookup_id_test" onclick="return showRelatedObjectLookupPopup(this);"> <img src="%(ADMIN_MEDIA_PREFIX)simg/admin/selector-search.gif" width="16" height="16" alt="Lookup" /></a>&nbsp;<strong>Hidden</strong>
+
+# Check that RelatedFieldWidgetWrapper doesn'tshow the add image when explicitely requested
+>>> site.register(Band)
+>>> rel = Album._meta.get_field('band').rel
+>>> w = RelatedFieldWidgetWrapper(SelectWidget(), rel, site, True)
+>>> print w.render('test', 'test')
+<select name="test">
+</select><a href="../../../admin_widgets/band/add/" class="add-another" id="add_id_test" onclick="return showAddAnotherPopup(this);"> <img src="/media/img/admin/icon_addlink.gif" width="10" height="10" alt="Add Another"/></a>
+
+>>> w = RelatedFieldWidgetWrapper(SelectWidget(), rel, site, False)
+>>> print w.render('test', 'test')
+<select name="test">
+</select>
+
-""" % {
-    'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX,
-    'STORAGE_URL': default_storage.url(''),

docs/ref/contrib/admin.txt

@@ -224 +224 @@
-``birth_date``, the forms resulting from the above declarations will contain
-exactly the same fields.
-
+``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.
+
-``filter_horizontal``
-~~~~~~~~~~~~~~~~~~~~~ 
-