Changeset 8861

Timestamp:

09/02/08 12:26:24 (4 months ago)

Author:

brosner

Message:

Fixed #7973 -- Added exclude to BaseModelAdmin? to make everything consistent with the form/formset factories. Refs #8071 to make it easier to get at exclude. Thanks julien for the patch.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (4 diffs)
• django/trunk/docs/ref/contrib/admin.txt (modified) (1 diff)
• django/trunk/tests/modeltests/model_formsets/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/modeladmin/models.py (modified) (1 diff)

django/trunk/django/contrib/admin/options.py

@@ -32 +32 @@
-    raw_id_fields = ()
-    fields = None
+    exclude = None
-    fieldsets = None
-    form = forms.ModelForm
@@ -263 +264 @@
-        else:
-            fields = None
+        if self.exclude is None:
+            exclude = []
+        else:
+            exclude = self.exclude
-        defaults = {
-            "form": self.form,
-            "fields": fields,
+            "exclude": exclude + kwargs.get("exclude", []),
-            "formfield_callback": self.formfield_for_dbfield,
-        }
@@ -781 +787 @@
-        else:
-            fields = None
+        if self.exclude is None:
+            exclude = []
+        else:
+            exclude = self.exclude
-        defaults = {
-            "form": self.form,
@@ -786 +796 @@
-            "fk_name": self.fk_name,
-            "fields": fields,
+            "exclude": exclude + kwargs.get("exclude", []),
-            "formfield_callback": self.formfield_for_dbfield,
-            "extra": self.extra,

django/trunk/docs/ref/contrib/admin.txt

@@ -181 +181 @@
-    dictionary key that is within the ``fieldsets`` option, as described in
-    the previous section.
+
+``exclude``
+~~~~~~~~~~~
+
+This attribute, if given, should be a list of field names to exclude from the
+form.
+
+For example, let's consider the following model::
+
+    class Author(models.Model):
+        name = models.CharField(max_length=100)
+        title = models.CharField(max_length=3)
+        birth_date = models.DateField(blank=True, null=True)
+
+If you want a form for the ``Author`` model that includes only the ``name``
+and ``title`` fields, you would specify ``fields`` or ``exclude`` like this::
+    
+    class AuthorAdmin(admin.ModelAdmin):
+        fields = ('name', 'title')
+    
+    class AuthorAdmin(admin.ModelAdmin):
+        exclude = ('birth_date',)
+
+Since the Author model only has three fields, ``name``, ``title``, and
+``birth_date``, the forms resulting from the above declarations will contain
+exactly the same fields.
-
-``filter_horizontal``

django/trunk/tests/modeltests/model_formsets/models.py

@@ -702 +702 @@
-True
-
-
-"""}

django/trunk/tests/regressiontests/modeladmin/models.py

@@ -117 +117 @@
-
-
+# Using `exclude`.
+
+>>> class BandAdmin(ModelAdmin): 
+...     exclude = ['bio'] 
+>>> ma = BandAdmin(Band, site) 
+>>> ma.get_form(request).base_fields.keys() 
+['name', 'sign_date']
+ 
+# Using `fields` and `exclude`.
+
+>>> class BandAdmin(ModelAdmin): 
+...     fields = ['name', 'bio'] 
+...     exclude = ['bio'] 
+>>> ma = BandAdmin(Band, site) 
+>>> ma.get_form(request).base_fields.keys() 
+['name']
+
-If we specify a form, it should use it allowing custom validation to work
-properly. This won't, however, break any of the admin widgets or media.