Changeset 8033

Timestamp:

07/21/08 20:10:06 (5 months ago)

Author:

jacob

Message:

Fixed #6755: model inheritance now works in the admin. Thanks, sloonz and Michael Placentra.

Files:

• django/trunk/AUTHORS (modified) (2 diffs)
• django/trunk/django/db/models/base.py (modified) (1 diff)
• django/trunk/django/db/models/fields/related.py (modified) (1 diff)
• django/trunk/tests/regressiontests/model_inheritance_regress/models.py (modified) (1 diff)

django/trunk/AUTHORS

@@ -304 +304 @@
-    phil.h.smith@gmail.com
-    Gustavo Picon
+    Michael Placentra II <someone@michaelplacentra2.net>
-    Luke Plant <http://lukeplant.me.uk/>
-    plisk
@@ -343 +344 @@
-    Jozko Skrablin <jozko.skrablin@gmail.com>
-    Ben Slavin <benjamin.slavin@gmail.com>
+    sloonz <simon.lipp@insa-lyon.fr>
-    SmileyChris <smileychris@gmail.com>
-    smurf@smurf.noris.de

django/trunk/django/db/models/base.py

@@ -300 +300 @@
-        if not raw:
-            for parent, field in meta.parents.items():
+                # At this point, parent's primary key field may be unknown
+                # (for example, from administration form which doesn't fill
+                # this field). If so, fill it.
+                if getattr(self, parent._meta.pk.attname) is None and getattr(self, field.attname) is not None:
+                    setattr(self, parent._meta.pk.attname, getattr(self, field.attname))
+
-                self.save_base(raw, parent)
-                setattr(self, field.attname, self._get_pk_val(parent._meta))

django/trunk/django/db/models/fields/related.py

@@ -707 +707 @@
-    def __init__(self, to, to_field=None, **kwargs):
-        kwargs['unique'] = True
+        kwargs['editable'] = False
-        if 'num_in_admin' not in kwargs:
-            kwargs['num_in_admin'] = 0

django/trunk/tests/regressiontests/model_inheritance_regress/models.py

@@ -160 +160 @@
-DoesNotExist: ItalianRestaurant matching query does not exist.
-
+# Regression test for #6755
+>>> r = Restaurant(serves_pizza=False)
+>>> r.save()
+>>> r.id
+3
+>>> r.place_ptr_id
+3
+>>> r = Restaurant(place_ptr_id=3, serves_pizza=True)
+>>> r.save()
+>>> r.id
+3
+>>> r.place_ptr_id
+3
+
+
-"""}