django-1.3.diff

Index: django/db/models/fields/subclassing.py
===================================================================
--- django/db/models/fields/subclassing.py	(revision 16141)
+++ django/db/models/fields/subclassing.py	(working copy)
@@ -87,16 +87,24 @@
     """
     A placeholder class that provides a way to set the attribute on the model.
     """
-    def __init__(self, field):
+    def __init__(self, field, old_descr=None):
         self.field = field
+        self.old_descr = old_descr
 
     def __get__(self, obj, type=None):
         if obj is None:
             raise AttributeError('Can only be accessed via an instance.')
-        return obj.__dict__[self.field.name]
+        if self.old_descr:
+            return self.old_descr.__get__(obj, type)
+        else:
+            return obj.__dict__[self.field.name]
 
     def __set__(self, obj, value):
-        obj.__dict__[self.field.name] = self.field.to_python(value)
+        val = self.field.to_python(value)
+        if self.old_descr:
+            self.old_descr.__set__(obj, val)
+        else:
+            obj.__dict__[self.field.name] = val
 
 def make_contrib(superclass, func=None):
     """
@@ -112,6 +120,7 @@
             func(self, cls, name)
         else:
             super(superclass, self).contribute_to_class(cls, name)
-        setattr(cls, self.name, Creator(self))
+        old_descr = cls.__dict__.get(self.name)
+        setattr(cls, self.name, Creator(self, old_descr))
 
     return contribute_to_class
Index: django/contrib/admin/options.py
===================================================================
--- django/contrib/admin/options.py	(revision 16141)
+++ django/contrib/admin/options.py	(working copy)
@@ -110,14 +110,17 @@
             # rendered output. formfield can be None if it came from a
             # OneToOneField with parent_link=True or a M2M intermediary.
             if formfield and db_field.name not in self.raw_id_fields:
-                related_modeladmin = self.admin_site._registry.get(
-                                                            db_field.rel.to)
-                can_add_related = bool(related_modeladmin and
-                            related_modeladmin.has_add_permission(request))
-                formfield.widget = widgets.RelatedFieldWidgetWrapper(
-                            formfield.widget, db_field.rel, self.admin_site,
-                            can_add_related=can_add_related)
 
+                # Only do this bit if the formfield is such that it accepts choices.
+                if hasattr(formfield.widget, 'choices'):
+                    related_modeladmin = self.admin_site._registry.get(
+                        db_field.rel.to)
+                    can_add_related = bool(related_modeladmin and
+                                           related_modeladmin.has_add_permission(request))
+                    formfield.widget = widgets.RelatedFieldWidgetWrapper(
+                        formfield.widget, db_field.rel, self.admin_site,
+                        can_add_related=can_add_related)
+
             return formfield
 
         # If we've got overrides for the formfield defined, use 'em. **kwargs