Commit Graph

4993 Commits

Author SHA1 Message Date
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
Russell Keith-Magee e969c2715f [1.1.X] Fixed #11801 -- Corrected form validation to ensure you can still get deleted_forms and ordered_forms when a form that is being deleted doesn't validate. Thanks to dantallis for the report and patch.
Backport of r12771 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 15:57:15 +00:00
Russell Keith-Magee 3f7fcdda71 [1.1.X] Fixed #12404 -- Improved model validation for CharField and DecimalField. Thanks to tiliv for the report, josh for the patch, and Leo for the tests.
Backport of r12768 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 15:24:28 +00:00
Russell Keith-Magee d1b889ec98 [1.1.X] Fixed #11891 -- Ensured that attributes of get_absolute_url are preserved through the metaclass. Thanks to nfg for the report and patch.
Backport of r12766 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 14:45:56 +00:00
Russell Keith-Magee 1e1b57bfbe [1.1.X] Fixed #11900 -- Corrected an edge case of transaction handling in the commit_on_success decorator. Thanks to guettli for the report, and Gabriel Hurley for the initial test case.
Backport of r12764 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 14:27:31 +00:00
Russell Keith-Magee 9137c54353 [1.1.X] Fixed #13093 -- Updated some decorators and the decorator_from_middleware function to allow callable classes to be decorated. Thanks to Brian Neal for the report.
Backport of r12762 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 13:31:10 +00:00
Luke Plant 693dcd9013 [1.1.X] Fixed #12048 - MultiWidget does not define `__deepcopy__`
Thanks to powderflask for report, test case and initial patch.

Backport of [12739] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-09 22:59:02 +00:00
Karen Tracey 0a7ec91dc3 [1.1.X] Changed last_executed_query to avoid raising exceptions on non-utf8-encoded parameter data.
r12737 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-09 14:49:50 +00:00
Luke Plant 89c2639323 [1.1.X] Fixed #11183 - BaseForm init leaves pointers pointing back to base_fields
Thanks to margieroginski for the report

Backport of [12733] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-09 02:03:09 +00:00
Karen Tracey f13b17ad15 [1.1.X] Fixed #12689: Fixed admin validation to report an error on invalid exclude specification. Thanks for report to bparker and for patch with tests to ramiro.
r12734 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-09 00:52:38 +00:00
Karen Tracey 75b10c9c15 [1.1.X] Fixed #12024: Changed admin code to avoid raising an exception when a field listed
in raw_id_fields has limit_choices_to specified as a Q object.

Tweaked a test to trigger the condition and verify the fix.

Finally, documented that limit_choices_to specified as a Q object has no effect
on the choices available for fields listed in raw_id_fields, and removed another
incorrect note that claimed limit_choices_to had no effect on inlines in the admin. 

r12728 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 18:41:26 +00:00
Karen Tracey 758123a1f9 [1.1.X] Fixed #11461: Ensured complete traceback is available on the debug page when an exception is encountered during template rendering, even when running on Python 2.6 or higher. Thanks Glenn.
r12725 and r12726 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 17:11:14 +00:00
Luke Plant 55c71d3ed5 [1.1.X] Fixed #11940 - ModelForm evaluates callable default values on form class creation
Thanks to Harm Geerts for the report and initial patch.

Backport of [12721] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 15:13:08 +00:00
Luke Plant 6c507a5cd4 [1.1.X] Fixed #12240 - select_related doesn't work correctly when mixing nullable and non-nullable keys
Thanks to embe for report and Alex for fix.

Backport of 12719 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 12:59:50 +00:00
Karen Tracey b86b38f618 [1.1.X] Fixed #6228: Changed common middleware to respect request-specific urlconf. Thanks trey, skevy, and mikexstudios.
r12704 and r12705 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 20:14:34 +00:00
Russell Keith-Magee 24b969d28e [1.1.X] Fixed #12876 -- Corrected a problem with recursive relations under deepcopy. Thanks to elachuni for the patch.
Backport of r12700 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 07:18:46 +00:00
Joseph Kocherhans 72a659f8f8 [1.1.X] Fixed #12858. DateTime related widgets now handle custom formats properly in _has_changed. Backport of r12698 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 04:06:23 +00:00