diff options
| -rw-r--r-- | AUTHORS | 3 | ||||
| -rw-r--r-- | django/db/models/related.py | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -98,6 +98,7 @@ answer newbie questions, and generally made Django that much better: Kieran Holland <http://www.kieranholland.com> Robert Rock Howard <http://djangomojo.com/> Jason Huggins <http://www.jrandolph.com/blog/> + Tom Insam Baurzhan Ismagulov <ibr@radix50.net> jcrasta@gmail.com Michael Josephson <http://www.sdjournal.com/> @@ -168,8 +169,8 @@ answer newbie questions, and generally made Django that much better: Aaron Swartz <http://www.aaronsw.com/> Tyson Tate <tyson@fallingbullets.com> Tom Tobin - Tom Insam Joe Topjian <http://joe.terrarum.net/geek/code/python/django/> + torne-django@wolfpuppy.org.uk Karen Tracey <graybark@bellsouth.net> Makoto Tsuyuki <mtsuyuki@gmail.com> Amit Upadhyay 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 |