Ticket #570: 570.2.diff

django/core/formfields.py

@@ -116 +116 @@
             if field.field_name == key:
                 if hasattr(field, 'requires_data_list') and hasattr(self.data, 'getlist'):
                     data = self.data.getlist(field.field_name)
+                elif hasattr(field, 'db_field_name'):
+                    data = self.data.get(field.db_field_name, None)
                 else:
                     data = self.data.get(field.field_name, None)
                 if data is None:
@@ -300 +302 @@
     html2python = staticmethod(html2python)
 
 class SelectField(FormField):
-    def __init__(self, field_name, choices=[], size=1, is_required=False, validator_list=[]):
+    def __init__(self, field_name, db_field_name=None, choices=[], size=1, is_required=False, validator_list=[]):
         self.field_name = field_name
+        if db_field_name:
+            self.db_field_name = db_field_name
         # choices is a list of (value, human-readable key) tuples because order matters
         self.choices, self.size, self.is_required = choices, size, is_required
         self.validator_list = [self.isValidChoice] + validator_list
@@ -309 +313 @@
     def render(self, data):
         output = ['<select id="%s" class="v%s%s" name="%s" size="%s">' % \
             (FORM_FIELD_ID_PREFIX + self.field_name, self.__class__.__name__, self.is_required and ' required' or '',
-            self.field_name, self.size)]
+            hasattr(self, 'db_field_name') and self.db_field_name or self.field_name, self.size)]
         str_data = str(data) # normalize to string
         for value, display_name in self.choices:
             selected_html = ''

django/core/meta/fields.py

@@ -188 +188 @@
                     else:
                         field_objs = [formfields.SelectField]
                     params['choices'] = self.get_choices()
+                    params['db_field_name'] = self.get_db_column()
         elif self.choices:
             if self.radio_admin:
                 field_objs = [formfields.RadioSelectField]