Author: russellm
Date: 2009-06-24 09:23:24 -0500 (Wed, 24 Jun 2009)
New Revision: 11102
Modified:
django/branches/releases/1.0.X/docs/ref/contrib/admin.txt
django/branches/releases/1.0.X/docs/topics/forms/modelforms.txt
Log:
[1.0.X] Fixed #8861 -- Added note on the availability of ModelForm.instance.
Thanks to Ramiro Morales for the patch.
Merge of r11097 from trunk.
Modified: django/branches/releases/1.0.X/docs/ref/contrib/admin.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/contrib/admin.txt 2009-06-24
14:22:11 UTC (rev 11101)
+++ django/branches/releases/1.0.X/docs/ref/contrib/admin.txt 2009-06-24
14:23:24 UTC (rev 11102)
@@ -724,7 +724,7 @@
-------------------------------------
Adding custom validation of data in the admin is quite easy. The automatic
admin
-interfaces reuses :mod:`django.forms`, and the ``ModelAdmin`` class gives you
+interface reuses :mod:`django.forms`, and the ``ModelAdmin`` class gives you
the ability define your own form::
class ArticleAdmin(admin.ModelAdmin):
@@ -744,7 +744,9 @@
It is important you use a ``ModelForm`` here otherwise things can break. See
the
:ref:`forms <ref-forms-index>` documentation on :ref:`custom validation
-<ref-forms-validation>` for more information.
+<ref-forms-validation>` and, more specifically, the
+:ref:`model form validation notes <overriding-modelform-clean-method>` for more
+information.
.. _admin-inlines:
Modified: django/branches/releases/1.0.X/docs/topics/forms/modelforms.txt
===================================================================
--- django/branches/releases/1.0.X/docs/topics/forms/modelforms.txt
2009-06-24 14:22:11 UTC (rev 11101)
+++ django/branches/releases/1.0.X/docs/topics/forms/modelforms.txt
2009-06-24 14:23:24 UTC (rev 11102)
@@ -370,12 +370,21 @@
-----------------------------
You can override the ``clean()`` method on a model form to provide additional
-validation in the same way you can on a normal form. However, by default the
-``clean()`` method validates the uniqueness of fields that are marked as
-``unique``, ``unique_together`` or ``unique_for_date|month|year`` on the model.
-Therefore, if you would like to override the ``clean()`` method and maintain
the
-default validation, you must call the parent class's ``clean()`` method.
+validation in the same way you can on a normal form.
+In this regard, model forms have two specific characteristics when compared to
+forms:
+
+By default the ``clean()`` method validates the uniqueness of fields that are
+marked as ``unique``, ``unique_together`` or ``unique_for_date|month|year`` on
+the model. Therefore, if you would like to override the ``clean()`` method and
+maintain the default validation, you must call the parent class's ``clean()``
+method.
+
+Also, a model form instance bound to a model object will contain a
+``self.instance`` attribute that gives model form methods access to that
+specific model instance.
+
Form inheritance
----------------
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
