a56b232cb5
[1.1.X] Fixed #13184 -- Document the requirement that custom model fields using SubfieldBase should probably implement formfield. Thanks to Mark L. for the report, and to Joseph and Honza for the guidance on the solution.
...
Backport of r12979 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 14:37:06 +00:00
a33c7673e4
[1.1.X] Fixed Python 2.4 incompatibility introduced in r12973.
...
r12947 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-14 21:27:21 +00:00
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
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
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
ee2b07c7fc
[1.1.X] Added Pyton 2.3 compatibility import for use of set by some new tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 21:11:56 +00:00
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
4771790c68
[1.1.X] svnmerge.py metatdata housekeeping.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 17:00:07 +00:00
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
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
a67b35a0aa
[1.1.X] Fixed #11711 -- clarified that ValuesQuerySets are not lists per se.
...
It rarely hurts to think of the returned result from a values() or
values_list() call as a list, but it's really an iterable and sometimes
the difference matters.
r12743 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 13:28:46 +00:00
6dc0499fe7
[1.1.X] Fixed two small doc markup errors.
...
Partial merge of r12741 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 13:24:31 +00:00
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
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
b2ecfe845f
[1.1.X] Fixed #13270 - typos in documentation
...
Thanks to cmbeelby for the report and patch
Backport of r12934 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 14:33:02 +00:00
0819c291e7
Fixed test failure that was occurring since r12909
...
The tests were relying on being able to do
ManyToManyField("NameOfThisModel") instead of the only documented method for
recursive relationships, namely ManyToManyField("self"). The former stopped
working when the fix in r12909 was applied.
Backport of r12932 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 12:22:29 +00:00
c65dd48903
[1.1.X] Fixed #13035 - Incorrect documentation regarding admin and default managers
...
Thanks to rasca for report and gabrielhurley for patch.
Backport of r12930 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 11:59:37 +00:00
c3bc6481af
[1.1.X] Fixed #13268 - 'ForeignKeyField' in topics/db/queries.txt
...
Thanks piquadrat for report and patch.
Backport of r12928 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 11:05:18 +00:00
cd3370c3a7
[1.1.X] Fixed #13263 -- Corrected field name typo in queries documentation examples. Thanks, RicherPots for bug report and gabrielhurley for the patch.
...
Backport of r12926 from trunk
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 16:00:31 +00:00
b2627529e9
[1.1.X] Fixed #13271 -- Corrected a typo in the signals documentation. Thanks, chtito.
...
Backport of r12924 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 15:47:05 +00:00
2e8f0a8f15
[1.1.X] Added file mistakenly ommitted from r12917
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 15:45:20 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
434b5d5cf6
[1.1.X] Fixed #13103 -- A bit of re-organization to the custom template `ModelAdmin` options documentation section to remove some duplication and fix some confusing wording.
...
Backport of r12868 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 21:17:23 +00:00
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
5fab617f50
[1.1.X] Fixed #13189 -- Fixed typo in code example, thanks to gabrielhurley for patch.
...
Backport of r12862 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 00:14:44 +00:00
87e40f8daa
[1.1.X] Fixed #13202 -- Documented required libraries for markup template tags, based on patch from steveed.
...
Backport of r12860 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 00:10:44 +00:00
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
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
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
373daf5876
[1.1.X] Modified the delete test to clean up after itself properly, so that the proxy_model_inheritance test can run without requiring manual confirmation.
...
Backport of r12850 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 17:32:52 +00:00
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
b74e6c3557
[1.1.X] Fixed #12286 -- Modified the test case added in r12828 so that it passes under Postgres.
...
Backport of r12846 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 13:15:13 +00:00
f0ed1ce683
[1.1.X] Fixed #13173 : Made the admin_scripts tests pass when the running python executable has a space in its pathname. Thanks gabrielhurley.
...
r12842 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 18:56:37 +00:00
Russell Keith-Magee
Karen Tracey
Brian Rosner
Justin Bronn
Luke Plant
Gary Wilson Jr
Jannis Leidel