1635 Commits

Author SHA1 Message Date
Russell Keith-Magee
167d1cbdf5 [1.2.X] Made a transaction test optional unless transactions are supported.
Backport of r15325 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 14:55:27 +00:00
Alex Gaynor
4cee764a46 [1.2.X] Fixed #13159 -- properly quote aggregates in order_by. Backport of [15318].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-26 03:52:41 +00:00
Carl Meyer
c09249731b [1.2.X] Fixed #14938 - Fixed save-as-new on inline formset with new forms.
Backport of r15306 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 05:06:43 +00:00
Carl Meyer
131d83b9cd [1.2.X] Fixed #11319 - Added lookup support for ForeignKey.to_field. Also reverted no-longer-needed model formsets workaround for lack of such support from r10756. Thanks Russell and Alex for review.
Backport of r15303 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15304 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 03:39:38 +00:00
Ramiro Morales
f01e1cd425 [1.2.X] Fixed #14796 -- Modified order of operations performed on field names by the inspectdb command so it doesn't generates model fields with names equal to Python keywords. Thanks pappjm at gmail dot com for the report, mmcnickle for the fix and Alex for simplifying the tests.
Backport of r15296 and r15297 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-25 00:42:54 +00:00
Russell Keith-Magee
a116ae6633 [1.2.X] Fixed #14240 -- Enabled localization for the filesize filter. Thanks to David Danier for the report and patch.
Backport of r15290 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15291 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 08:33:51 +00:00
Russell Keith-Magee
a9cf3d2372 [1.2.X] Fixed #14982 -- Ensure that EMPTY_CHANGELIST_VALUE is honored for nullable foreign keys. Thanks to marcob for the report and fix, and to sontek for the test case.
Backport of r15286 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-24 07:10:18 +00:00
Ramiro Morales
715c00df76 [1.2.X] Fixed a regression in the test suite from [15236]. Backport of r15244.
Also, changed an asertion not supported by unittest.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-21 01:37:08 +00:00
Ramiro Morales
cf7157a7a4 [1.2.X] Fixed #15122 -- Restored reporting of the template files tried in the texmplate loader post mortem section of the TemplateDoesNotExit 500 error debug page. Thanks rdrey for reporting this regression.
Backport of [15252] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-20 23:17:37 +00:00
Russell Keith-Magee
0958f32209 [1.2.X] Refs #14661 -- Clarified the handling of initial data injected via custom SQL.
This is BACKWARDS INCOMPATIBLE CHANGE for anyone relying on SQL-injected initial data in a test case.

Backport of r15239 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15241 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 16:55:00 +00:00
Russell Keith-Magee
86239cbb56 [1.2.X] Refs #14661 -- Corrected (well... hacked around) a test failure under MySQL/MyISAM with the queries regression test.
Backport of r15238 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 16:54:28 +00:00
Jannis Leidel
b305cc33c5 [1.2.X] Fixed #14468 -- Extended the list of content types that the test client could guess when handling zip files. Thanks, Russ and emulbreh.
Backport from trunk (r15236).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15237 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-18 00:00:11 +00:00
Russell Keith-Magee
aeddab3fc7 [1.2.X] Corrected an aggregation test failure under PostgreSQL, introduced by r15223. Thanks to Alex for the report.
Backport of r15230 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15231 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-17 02:40:16 +00:00
Russell Keith-Magee
be12f9e278 [1.2.X] Fixed #14707 -- Relax the protections on aggregate naming collisions when a ValuesQuerySet removes the colliding name. Thanks to Andy McKay for the report.
Backport of r15223 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15224 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-16 08:04:39 +00:00
Russell Keith-Magee
84db894f44 [1.2.X] Fixed #15042 -- Ensured that email addresses without a domain can still be mail recipients. Patch also improves the IDN handling introduced by r15006, and refactors the test suite to ensure even feature coverage. Thanks to net147 for the report, and to Łukasz Rekucki for the awesome patch.
Backport of r15211 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15213 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 06:06:34 +00:00
Ramiro Morales
74a61e35b8 [1.2.X] Fixed #14948 -- Fixed a couple of cases where invalid model classes were passed to the database router when collecting reverse foreign key and many to many relationships. Thanks shell_dweller for the report and Harm Geerts for the patch.
This also enhances tests added in r15186.

Code in SVN trunk doesn't suffer from this problem because it was refactored in r14507.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 23:30:17 +00:00
Ramiro Morales
88dfbc50fb [1.2.X] Enhanced tests for r14857 added in r15185. Refs #14870. Thanks Harm Geerts.
Backport of [15201] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-14 03:53:01 +00:00
Russell Keith-Magee
924bad822a [1.2.X] Fixed #13631 -- Made sure that max_length and min_length are retained as attributes on form fields. Thanks to mila for the report.
Backport of r15194 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 16:43:18 +00:00
Ramiro Morales
3297c09da4 [1.2.X] Fixed #2986 -- Made the JavaScript code that drives related model instance addition in a popup window handle a model representation containing new lines. Also, moved the escapejs functionality to django.utils.html so it can be used from Python code. Thanks andrewwatts for the patch.
Backport of [15131] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 15:47:36 +00:00
Russell Keith-Magee
58038a8b2b [1.2.X] Fixed #14176 -- Added forwards compatibility to the legacy syndication feed view. This allows class-based feeds to be deployed using the old-style feed view, as long as the feed requires no arguments (i.e., get_object returns None). Thanks to psychcf for the report, cwhaines for the investigation, and Andrew Godwin for the assist.
Backport of r15189 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 14:54:49 +00:00
Ramiro Morales
857b49d1c3 [1.2.X] Fixed #13668 -- Corrected database router methods invocation for ManyToMany fields without through models. Thanks craig.kimerer for the report and David Gouldin for the fix.
This also adds tests for r14857.

Backport of [15185] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 04:59:31 +00:00
Ramiro Morales
4d2708ff01 [1.2.X] Fixed #15024 -- Ensure that choice of L10N format module used is stable given a stable setup of format modules in ll/ and ll_CC/ dirs. Thanks David Reynolds for the report and suggestions leading to the solution.
Backport of [15183] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-13 03:13:39 +00:00
Ramiro Morales
90be6ca20d [1.2.X] Fixed #15032 -- Replaced 1.2.X implementation of admin changelist filtering security fix (r15031/r15033) with the one from trunk so another valid filter usage scenario (using model inheritance) is still possible. Thanks rene for reporting this.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-12 23:25:33 +00:00
Alex Gaynor
b28756bb29 [1.2.X] Fixed #11293 -- fixed using Q objects to generate ORs with aggregates. Backport of [15173].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-11 01:03:08 +00:00
Andrew Godwin
663eb9656a [1.2.X] Fix wrong attribute name in [15156]. Thanks to Alex Gaynor for spotting this.
Backport of [15169] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-10 13:45:36 +00:00
Luke Plant
03ab30c3f1 [1.2.X] Fixed test failure when using Python 2.7
Backport of [14309] from trunk.

Fixed #14947

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 16:13:58 +00:00
Andrew Godwin
34d306c71c Fixed #12295 -- Issue had already been fixed, but added test. Thanks tomevans222 and dpn.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 14:50:31 +00:00
Andrew Godwin
2b90267fa8 [1.2.X] Fixed #9029 -- Allow use of fieldname_id with get_or_create. Thanks to aaron and mrmachine.
Backport of [15156] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 13:40:23 +00:00
Russell Keith-Magee
c76ab45fc6 [1.2.X] Fixed #14999 -- Ensure that filters on local fields are allowed, and aren't caught as a security problem. Thanks to medhat for the report.
Backport of r15139 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-03 14:01:44 +00:00
Alex Gaynor
05588a1897 [1.2.X] Converted the Czech localflavor tests to be unittests. We have always been at war with doctests. Thanks to Idan Gazit. Partial backport of [15062].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-27 07:47:25 +00:00
Jannis Leidel
79e64d7cff [1.2.X] Converted Swedish localflavor tests from doctests to unittests. Thanks, Idan Gazit!
Backport from trunk (r15057).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-26 11:49:45 +00:00
Alex Gaynor
85207a245b Fix a security issue in the admin. Disclosure and new release forthcoming.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 03:46:16 +00:00
Jannis Leidel
2565b80706 [1.2.X] Fixed #14301 -- Further refine changes made in r14217 to support non-ASCII characters in email addresses. Thanks, Claude Peroz and Andi Albrecht.
Backport from trunk (r15006).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:28:11 +00:00
Jannis Leidel
0e651d3fd4 [1.2.X] Fixed #4976 -- Stopped humanize template tags to raise a TypeError if passed a value of `None`. Thanks, Simon G. and Adam Vandenberg.
Backport from trunk (r15000).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:16:05 +00:00
Jannis Leidel
9184dba1f5 [1.2.X] Fixed #13743 -- Fixed CommentsAdmin to not blow up if the delete_selected action is disabled. Thanks, Daniel Lindsley.
Backport from trunk (r14996).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-21 15:14:28 +00:00
Alex Gaynor
eb7f2789f8 [1.2.X] Fixed a Python 2.5 syntax error. Backport of [14983].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-19 02:01:01 +00:00
Ramiro Morales
d5c15a490e [1.2.X] Fixed a couple of tests migrated to unit tests in r14279 so they actually and correctly exercise the functionality under test.
Backport of [14981] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 23:10:29 +00:00
Alex Gaynor
160533410f [1.2.X] Fixed #14871, #14872 -- ZAIDField didn't handle alll EMPTY_VALUES correctly and ZAPostCodeField didn't respect *args or **kwargs (such as required=False). Also converted South African localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14956].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:16:15 +00:00
Alex Gaynor
989f59299c [1.2.X] Converted Uruguayan localflavor doctests into unittests. We have alwyas been at war with doctests. Thanks to Idan Gazit. Backport of [14955].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:16:01 +00:00
Alex Gaynor
0c33a3a89c [1.2.X] Converted United States localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14954].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:52 +00:00
Alex Gaynor
e7703398c4 [1.2.X] Converted United Kingdom localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14953].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:41 +00:00
Alex Gaynor
b17b567744 [1.2.X] Converted Slovak localflavor doctests into unitttests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14952].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:31 +00:00
Alex Gaynor
60e36fbc72 [1.2.X] Fixed #14864, #14864 -- ROCIFField didn't accept values starting with RO, as it was supposed to, and ROCNPField, ROIBANField, and ROPhoneNumberField didn't handle all EMPTY_VALUES correctly. Also converted Romanian localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14951].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:18 +00:00
Alex Gaynor
b6fbf30a32 [1.2.X] Converted Portuguese localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14950].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:15:03 +00:00
Alex Gaynor
4b3198d15d [1.2.X] Fixed #14860 -- PLPESELField, PLNIPField, and PLREGONField didn't handle all EMPTY_VALUES correctly. Also converted teh Polish localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14949].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:52 +00:00
Alex Gaynor
a15aa66917 [1.2.X] Converted Dutch localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14948].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:39 +00:00
Alex Gaynor
771ffbf0f6 [1.2.X] Converted Kuwaiti localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14947].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:30 +00:00
Alex Gaynor
5c3ede2171 [1.2.X] Converted Japanese localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14946].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:20 +00:00
Alex Gaynor
f2a8534d7b [1.2.X] Fixed #14859 -- ITSocialSecurityNumberField and ITVatNumberField didn't handle all EMPTY_VALUES gracefully. Also converted the Italias localflavor doctests into unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14945].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:14:11 +00:00
Alex Gaynor
edcb475381 [1.2.X] Converted Icelandic localflavor doctests to unittests. We have always been at war with doctests. Thanks to Idan Gazit. Backport of [14944].
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-18 22:13:58 +00:00