Karen Tracey
ef6308db01
[1.1.X] Fixed #13335 : Adjusted the r12950 fix to properly handle import errors resulting from nested calls to load_app.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12973 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-14 19:14:23 +00:00
Russell Keith-Magee
65a9d73069
[1.1.X] Fixed #13332 -- Corrected the cleanup code in the test client to avoid a refcounting problem with signal handlers. This is a fix for the benefit of PyPy's hybrid GC. Thanks to Alex Gaynor for the report and patch.
...
Backport of r12964 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 02:43:03 +00:00
Russell Keith-Magee
cf08ea496e
[1.1.X] Refs #13227 -- Partial backport of r12865; backported the changes to Where tree cloning logic to ensure that unclonable objects in a where() clause don't break querying.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 02:00:46 +00:00
Karen Tracey
eca89ea9be
[1.1.X] Fixed #12142 -- EmptyQuerySet.update() no longer updates all rows in the database
...
r12171 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 17:27:53 +00:00
Brian Rosner
f45e39ba8e
Fixed #11957 -- exceptions in admin.py are no longer hidden after second request
...
Before you had to restart runserver for the correct exception message to show
up again. Reverts fix in r9680 which has this side-affect.
Thanks to jarrow, carljm and ramiro for their work on the patch and tickets.
Backport of r12956 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:55:45 +00:00
Russell Keith-Magee
38056e82d7
[1.1.X] Fixed #13309 -- Ensure that delete() deletes everything it should delete(). Thanks to craig.kimerer@gmail.com for the report
...
Backport of r12941 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:22:16 +00:00
Karen Tracey
46b9dd3048
[1.1.X] Fixed #11696 : Changed app loading code so that it does not swallow import errors that used to be (prior to r10088) raised.
...
r12950 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 12:43:39 +00:00
Justin Bronn
bf5d71f2a7
[1.1.X] Fixed #9437 -- Now close the connection after getting the PostGIS version during spatial backend initialization.
...
Backport of r12948 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 19:01:02 +00:00
Russell Keith-Magee
dce7515bef
[1.1.X] Fixed #13129 -- Corrected CSS on RTL layout when a changelist has admin actions and is filtered. Thanks to mksoft for the report and patch.
...
Backport of r12920 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 13:01:14 +00:00
Russell Keith-Magee
985c764a77
[1.1.X] Fixed #12260 -- Corrected CSS when using checkbox widgets on a ModelMultipleChoiceField in admin. Thanks to tiliv for the report and fix.
...
Backport of r12918 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:38:30 +00:00
Russell Keith-Magee
c01735dee7
[1.1.X] Fixed #11949 -- Added a hook to allow ModelAdmin customization of the delete selected template. Thanks to bendavis78 for the report and patch, and Ramiro Morales for his cleanup work.
...
Backport of r12916 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:08:45 +00:00
Russell Keith-Magee
0d6a776ccd
[1.1.X] Fixed #12328 -- Corrected the handling of subqueries with ordering and slicing, especially when used in delete subqueries. Thanks to Walter Doekes for the report.
...
This fixes a feature that isn't available under MySQL and Oracle (Refs #10099 ).
Backport of r12912 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-04 17:17:46 +00:00
Russell Keith-Magee
17636ef999
[1.1.X] Fixed #12247 -- Corrected the way update queries are processed when the update only refers to attributes on a base class. Thanks to jsmullyan for the report, and matiasb for the fix.
...
Backport of r12910 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-03 11:47:46 +00:00
Russell Keith-Magee
ac0aea8910
[1.1.X] Fixed #11956 -- Modified the handling of m2m relationships between subclasses. Thanks to nidi for the report, and astoneman for the suggestion on how to fix the problem.
...
Backport of r12908 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-02 15:52:58 +00:00
Justin Bronn
adfeb96227
[1.1.X] Fixed #13256 -- `OGRGeometry` no longer raises an exception when compared to instances of different types. Thanks, ninowalker for the bug report.
...
Backport of r12905 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 16:57:23 +00:00
Russell Keith-Magee
33052458c5
[1.1.X] Fixed #13259 -- Ensure that multiple calls to message() don't corrupt any extra message headers. Thanks to canburak for the report, and Andi Albrecht for the fix.
...
Backport of r12901 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 15:25:54 +00:00
Justin Bronn
fa114305cb
[1.1.X] No longer use the deprecated GEOS C API function `GEOSGeomFromWKB_buf` when unpickling `GEOSGeometry` objects.
...
Backport of r12898 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 18:58:19 +00:00
Russell Keith-Magee
7a7b9a0428
[1.1.X] Fixed #11916 -- Corrected handling of aggregation when there is a subquery provided in an extra(select=) clause. Thanks to jaklaassen@gmail.com for the report, and to tobias, paluh, Karen Tracey and Ian Kelly for their work on the fix.
...
Backport of r12896 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 13:51:20 +00:00
Russell Keith-Magee
f0fa0808ea
[1.1.X] Fixed #13253 -- Updated the help message for dumpdata to indicate that individual models can be serialized. Thanks to arowla for the report.
...
Backport of r12893 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 11:34:32 +00:00
Brian Rosner
64e4ffc932
[1.1.X] Restored pre-r10062 behavior allowing None from formfield_callback to exclude itself from the form
...
Backported from r12891 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 08:08:29 +00:00
Justin Bronn
2613872969
[1.1.X] Fixed #10594 -- `GeoQuerySet` measurment methods no longer crash on geometry fields with NULL values. Thanks, whiteinge for the bug report and yourcelf for the initial patch.
...
Backport of r12885 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 22:20:51 +00:00
Justin Bronn
8ef5daeb4f
[1.1.X] Added another GDAL bug workaround for retrieving the correct coordinate dimension on geometry collections. Refs #12312 .
...
Backport of r12883 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 21:58:48 +00:00
Justin Bronn
08d00942d0
[1.1.X] Fixed #11785 -- Clarified error message when the layer geometry type doesn't match the model field. Thanks, esizikov for bug report and initial patch.
...
Backport of r12880 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 18:34:09 +00:00
Justin Bronn
ceb5261276
[1.1.X] Fixed #12312 -- Set the coordinate dimension on each component of geometry collections after transform (refines GDAL bug workaround introduced in r11629). Thanks, yourcelf for bug report.
...
Backport of r12878 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 17:36:25 +00:00
Justin Bronn
e53de431f2
[1.1.X] `OGRGeomType` now recognizes 2.5D types, and removes need for unnecessary workaround in `Layer.geom_type`; corrected geometry type in test VRT file. Refs #11433 .
...
Backport of r11739 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 16:48:38 +00:00
Justin Bronn
127d46e6a5
[1.1.X] Fixed a brittle test case that was failing on PostGIS versions < 1.4.
...
Backport of r11729 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 16:41:29 +00:00
Jannis Leidel
5a6446b443
[1.1.X] Fixed #12778 - Added media handling abilities to admin inlines. Thanks for the patch, pmclanahan.
...
Backport from trunk, r12825.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12864 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 12:35:59 +00:00
Gary Wilson Jr
52e2e5cc96
[1.1.X] Removed out-of-date statement in markdown templatetags docstring (refs #1204 ).
...
Backport of r12858 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 23:56:56 +00:00
Russell Keith-Magee
7733895382
[1.1.X] Fixed #12594 -- Ensured that a meaningful exception is raised when the urlconf_module is None. Thanks to buriy for the report and patch.
...
Backport of r12854 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 15:15:55 +00:00
Justin Bronn
917fb7c993
[1.1.X] Peform smarter version detection of GDAL so development versions are supported.
...
Backport of r12852 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 20:01:40 +00:00
Russell Keith-Magee
93b5edddce
[1.1.X] Fixed #12766 -- Only set the psycopg1 client encoding when the connection is first created. This allows the custom_pk test to pass under psycopg1.
...
Backport of r12848 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 14:04:46 +00:00
Russell Keith-Magee
21a1a21d0b
[1.1.X] Fixed #13177 -- Corrected usage of firstof in admin templates. Thanks to nomulous for the report and patch.
...
Backport of r12840 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 14:55:00 +00:00
Russell Keith-Magee
752856530f
[1.1.X] Fixed #12612 -- Corrected handling of parameter formatting in SQLite backend so that executemany raises exceptions when bad parameter counts are provided. Thanks to Niels <niels@pythonheads.nl> for the report, and Gabriel Hurley for the help narrowing down the problem.
...
Backport of r12836 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 14:08:31 +00:00
Karen Tracey
ef41bd405e
[1.1.X] Fixed #12554 again: Corrected regression in silencing attribute lookups introduced in r12824, plus added a test for this so it doesn't regress again.
...
r12834 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-22 19:16:31 +00:00
Karen Tracey
740c974541
[1.1.X] Fixed #12822 : Don't copy the _aggregate_select_cache when cloning a query set,
...
as that can lead to incorrect SQL being generated for the query. Thanks to mat
for the report and test, tobias for the fix, and Alex for review.
r12830 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-21 20:54:24 +00:00
Karen Tracey
3a55a2f42c
[1.1.X] Fixed #12286 : Ensure proxied model's table is created.
...
Thanks to telenieko for the report and flyingfred0 for test and fix.
Test is r12828 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-21 20:35:05 +00:00
Karen Tracey
df010f0a1f
[1.1.X] Fixed #12554 : Silence exceptions that have specified silent_variable_failure=True. Thanks Thomas Steinacher, copelco, mlavin.
...
r12823 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 20:31:57 +00:00
Karen Tracey
d5336b221c
[1.1.X] Fixed #12239 , again: Refined the original fix to avoid the test errors introduced. Thanks pmclanahan.
...
r12821 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 20:11:38 +00:00
Karen Tracey
8badb75876
[1.1.X] Fixed #12239 : Fixed results of gte and lt queries when comparing floats to integer field values.
...
Thanks waverider, aroy, SmileyChris, and pmclanahan.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12820 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 18:04:10 +00:00
Russell Keith-Magee
4d00ac86ee
[1.1.X] Fixed #12851 -- Corrected the interaction of defer() with select_related(). Thanks to ruosteinen for the report.
...
Backport of r12817 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 15:42:18 +00:00
Karen Tracey
eb1c7b033d
[1.1.X] Fixed #12707 . Admin action messages are no longer displayed when submitting list_editable content. Thanks, copelco.
...
and
Fixed #12962 : Made admin delete action work again. Thanks ptone, skevy, mlavin and anyone else I've missed.
r12525 and r12813 from trunk, together to avoid the regression introduced by r12525 alone.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 15:23:10 +00:00
Russell Keith-Magee
3213498681
[1.1.X] Fixed #12850 -- Ensured that constraint names are quoted when they are removed. Thanks to Tim Kersten for the report and patch.
...
Backport of r12811 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 12:30:40 +00:00
Russell Keith-Magee
9d5fb83b09
[1.1.X] Fixed #13152 -- Ensure the test client saves the session before writing the session key to the cookie, in case the session engine changes the session key.
...
Backport of r12806 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-19 05:43:32 +00:00
Karen Tracey
16850856f5
[1.1.X] Changed the comments post view code to avoid raising an exception if handed invalid data for the object pk. Thanks to Leo for the test.
...
r12800 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 22:45:42 +00:00
Karen Tracey
e15c850f1b
[1.1.X] Fixed #12105 : Corrected handling of isnull=False lookups in admin. Thanks marcob, Travis Cline, gabrielhurley.
...
r12795 backport from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12796 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 19:08:49 +00:00
Russell Keith-Magee
322a50a3fc
[1.1.X] Fixed #12339 -- Made content type deletion an interactive process to prevent accidentally cascade deleting content from a production database. Thanks to kcarnold for the report and patch.
...
Backport of r12782 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 09:59:38 +00:00
Russell Keith-Magee
c64669a614
[1.1.X] Fixed #13114 -- Modified escapejs to produce output that is JSON compliant. Thanks to David Danier for the report.
...
Backport of r12780 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 08:06:47 +00:00
Russell Keith-Magee
d3ee5566b4
[1.1.X] Fixed #13108 -- Corrected an ambiguity in test data with the potential to cause test failures out of the box. Thanks to benreynwar for the report.
...
Backport of r12778 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 06:57:07 +00:00
Karen Tracey
7d3846a7b8
[1.1.X] Revert r12763 until we figure out what's wrong with it on 1.1.X. Refs #13111 .
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-14 00:17:37 +00:00
Karen Tracey
c94de07570
[1.1.X] Fixed #13107 : Adjusted decimal_places validation to accept 0 as a valid value. Thanks to loewis for report.
...
r12774 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-13 22:15:09 +00:00