5 Commits

Author SHA1 Message Date
Ramiro Morales
7cfb2b6335 [1.2.X] Tweaked some asserts not present in older unittest or deprecated from tests added in r15499. Refs #13987
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-13 03:15:34 +00:00
Russell Keith-Magee
48fe6099c0 [1.2.X] Fixed #13987 -- Ensure that the primary key is set correctly for all models that have concrete-abstract-concrete inheritance, not just the first model. Thanks to Aramgutang for the report and patch.
Backport of r15498 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-12 15:15:44 +00:00
Alex Gaynor
1aaf270d73 [1.2.X] Fixed #14423 -- corrected incorrect SQL being generated when a nullable, inherited field was used in an exclude. Thanks to PhiR_42 for the patch. Backport of [14600].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 16:47:46 +00:00
Ramiro Morales
8acad926df [1.2.X] Fixed #11369 -- Corrected verbose_name_plural model Meta option to be consistent with verbose_name when using abstract model inheritance. Thanks Beetle_B for the report.
Backport of [14588] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-17 12:24:47 +00:00
Russell Keith-Magee
10fafed666 [1.2.X] Migrated model_inheritance_regress doctests. Thanks to Gregor Müllegger for the patch.
Backport of r14576 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14577 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-16 15:15:47 +00:00