Ticket #338: django-select-prepopulate.patch

django/core/formfields.py

@@ -114 +114 @@
     def __getitem__(self, key):
         for field in self.manipulator.fields:
             if field.field_name == key:
-                if hasattr(field, 'requires_data_list') and hasattr(self.data, 'getlist'):
-                    data = self.data.getlist(field.field_name)
-                else:
-                    data = self.data.get(field.field_name, None)
-                if data is None:
-                    data = ''
-                return FormFieldWrapper(field, data, self.error_dict.get(field.field_name, []))
+                
+                data = field.extract_data(self.data)
+                
+                return FormFieldWrapper(field, data, self.error_dict.get(field.field_name, []))
         raise KeyError
 
     def has_errors(self):
@@ -137 +134 @@
         return str(self.formfield.render(self.data))
 
     def __repr__(self):
-        return '<FormFieldWrapper for "%s">' % self.formfield.field_name
+        return '<FormFieldWrapper for "%s": %s >' % self.formfield.field_name, repr(self.data)
 
     def field_list(self):
         """
@@ -209 +206 @@
     def render(self, data):
         raise NotImplementedError
 
+    def get_member_name(self):
+        return self.field_name
+
+    def extract_data(self, data_dict):
+        if hasattr(self, 'requires_data_list') and hasattr(data_dict, 'getlist'):
+            data = data_dict.getlist(self.get_member_name())
+        else:
+            data = data_dict.get(self.get_member_name(), None)
+        if data is None:
+            data = ''
+        
+        return data
+
 ####################
 # GENERIC WIDGETS  #
 ####################
@@ -319 +329 @@
         output.append('  </select>')
         return '\n'.join(output)
 
+    def get_member_name(self):
+        return "%s_id" % self.field_name
+
     def isValidChoice(self, data, form):
         str_data = str(data)
         str_choices = [str(item[0]) for item in self.choices]