summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2011-01-20 00:33:32 +0000
committerCarl Meyer <carl@oddbird.net>2011-01-20 00:33:32 +0000
commit93a4d46184bba069fc6a9aa5517802b2488032ac (patch)
tree48f820d5a0fbd42164b140ed2c9f9927abdafffe /docs
parente01cb0740496f12323260205687111a54a91e10f (diff)
Fixed #14672 - Added admin handling for on_delete=PROTECT. Thanks to jtiai for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/models/fields.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/ref/models/fields.txt b/docs/ref/models/fields.txt
index 4b286aa232..38a7a10f2a 100644
--- a/docs/ref/models/fields.txt
+++ b/docs/ref/models/fields.txt
@@ -971,7 +971,8 @@ define the details of how the relation works.
* :attr:`~django.db.models.CASCADE`: Cascade deletes; the default.
* :attr:`~django.db.models.PROTECT`: Prevent deletion of the referenced
- object by raising :exc:`django.db.IntegrityError`.
+ object by raising :exc:`django.db.models.ProtectedError`, a subclass of
+ :exc:`django.db.IntegrityError`.
* :attr:`~django.db.models.SET_NULL`: Set the :class:`ForeignKey` null;
this is only possible if :attr:`null` is ``True``.