summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-02-13 06:27:28 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-02-13 06:27:28 +0000
commitff46f0fbcf601be73a7f0866986aa96abac79e8e (patch)
treec6abfdb881d2acd5a809bc1e62bc524677830ad3 /django
parent5bed563edfa6c824723bc4c5d78d965202fe967e (diff)
Fixed #3394 -- Made min_num_in_admin be respected on new object creation. Patch
from torne-django@wolfpuppy.org.uk. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4500 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/db/models/related.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/db/models/related.py b/django/db/models/related.py
index ac1ec50ca2..b76da34079 100644
--- a/django/db/models/related.py
+++ b/django/db/models/related.py
@@ -68,7 +68,10 @@ class RelatedObject(object):
# object
return [attr]
else:
- return [None] * self.field.rel.num_in_admin
+ if self.field.rel.min_num_in_admin:
+ return [None] * max(self.field.rel.num_in_admin, self.field.rel.min_num_in_admin)
+ else:
+ return [None] * self.field.rel.num_in_admin
def get_db_prep_lookup(self, lookup_type, value):
# Defer to the actual field definition for db prep