p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #1017 -- Admin now selects single choice for ForeignKey fields if only one choice is available. Thanks for reporting, Eugene 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2005-12-09 02:25:17 +00:00
parent dc2daff31f
commit 58220b17d6
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
django/core/meta/fields.py
View File

@ -727,12 +727,16 @@ class ForeignKey(Field):
def flatten_data(self, follow, obj=None): def flatten_data(self, follow, obj=None):
if not obj: if not obj:
# In required many-to-one fields with only one available choice, # In required many-to-one fields with only one available choice,
# select that one available choice. Note: We have to check that # select that one available choice. Note: For SelectFields
# the length of choices is *2*, not 1, because SelectFields always # (radio_admin=False), we have to check that the length of choices
# have an initial "blank" value. # is *2*, not 1, because SelectFields always have an initial
if not self.blank and not self.rel.raw_id_admin and self.choices: # "blank" value. Otherwise (radio_admin=True), we check that the
# length is 1.
if not self.blank and (not self.rel.raw_id_admin or self.choices):
choice_list = self.get_choices_default() choice_list = self.get_choices_default()
if len(choice_list) == 2: if self.radio_admin and len(choice_list) == 1:
return {self.attname: choice_list[0][0]}
if not self.radio_admin and len(choice_list) == 2:
return {self.attname: choice_list[1][0]} return {self.attname: choice_list[1][0]}
return Field.flatten_data(self, follow, obj) return Field.flatten_data(self, follow, obj)