Ticket #769: fields.diff

core/meta/fields.py

@@ -224 +224 @@
         if self.maxlength and not self.choices: # Don't give SelectFields a maxlength parameter.
             params['maxlength'] = self.maxlength
         if isinstance(self.rel, ManyToOne):
-            params['member_name'] = name_prefix + self.get_db_column()
+            params['member_name'] = name_prefix + self.attname
             if self.rel.raw_id_admin:
                 field_objs = self.get_manipulator_field_objs()
                 params['validator_list'].append(curry(manipulator_valid_rel_key, self, manipulator))
@@ -312 +312 @@
         if self.choices:
             return first_choice + list(self.choices)
         rel_obj = self.rel.to
-        return first_choice + [(getattr(x, rel_obj.pk.attlist), str(x)) for x in rel_obj.get_model_module().get_list(**self.rel.limit_choices_to)]
+        return first_choice + [(getattr(x, rel_obj.pk.attname), str(x)) for x in rel_obj.get_model_module().get_list(**self.rel.limit_choices_to)]
 
     def get_choices_default(self):
         if(self.radio_admin):
@@ -332 +332 @@
         "flattened" string values for the admin view. Obj is the instance to extract the 
         values from.
         """
-        return { self.get_db_column(): self._get_val_from_obj(obj)}
+        return { self.attname: self._get_val_from_obj(obj)}
 
     def get_follow(self, override=None):
         if override != None:
@@ -409 +409 @@
 
     def flatten_data(self, follow, obj = None):
         val = self._get_val_from_obj(obj)
-        return {self.get_db_column(): (val is not None and val.strftime("%Y-%m-%d") or '')}
+        return {self.attname: (val is not None and val.strftime("%Y-%m-%d") or '')}
 
 class DateTimeField(DateField):
     def get_db_prep_save(self, value):
@@ -639 +639 @@
 
     def flatten_data(self,follow, obj = None):
         val = self._get_val_from_obj(obj) 
-        return {self.get_db_column(): (val is not None and val.strftime("%H:%M:%S") or '')} 
+        return {self.attname: (val is not None and val.strftime("%H:%M:%S") or '')} 
 
 class URLField(Field):
     def __init__(self, verbose_name=None, name=None, verify_exists=True, **kwargs):