829c5fdbee
Revert part of r12998 that prevents the forms doctests in tests.py from running.
...
Adjust the fr.py localflavor tests to account for r13007.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 20:39:22 +00:00
12cc292fc1
Fixed #13387 -- Removed some duplicated departments in the French localflavor. Thanks to Pinaraf for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 15:05:05 +00:00
cb906e1593
Fixed #13366 -- Corrected the field __setstate__ method to avoid a race condition when initially importing models. Thanks to Brett Hoerner for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 14:39:46 +00:00
424be52372
Fixed #13382 -- Modified a message used for testing purposes to allow test passes under PyPy. Thanks to Alex Gaynor for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 12:20:14 +00:00
ea7df23395
Fixed #11967 : use a different technique to get `ADMIN_MEDIA_PREFIX` in admin JS.
...
We now store ADMIN_MEDIA_PREFIX on the window object and let JS files read it
from there. The old technique -- looking a <script> tags and trying to deduce
the prefix -- broke with libraries like TineMCE that dynamically add <script>
tags to the <head>.
This is potentially backwards-incompatible for folks who've overridden
`admin/base.html`; they'll need to add the proper <script> line to
their new `admin/base.html`. For that reason, this changeset shouldn't
be backported to 1.1.X.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 18:37:12 +00:00
fef0d25bdc
Fixed #13373 -- Ensured that {% if %} statements will short circuit template logic and not evaluate clauses that don't require evaluation. Thanks to Jerry Stratton for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13001 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 14:18:14 +00:00
ebfe9383bf
Fixed #13370 -- Corrected the handling of pickling for lazy() proxy objects. Thanks to Alex Gaynor for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13000 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 12:40:46 +00:00
56eb340528
Fixed #13374 -- Corrected some more minor issues causing problems for PyPy. Thanks to Alex Gaynor for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 11:52:56 +00:00
c3dbe9d509
Fixed #13361 - Made sure jQuery is always included in the admin changelist and changeform. Thanks to Carl Meyer for report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 10:16:25 +00:00
1ad9c36fb8
Fixed #11810 -- Fixed typo and errors that prevented `modifiable` from working in the geographic admin. Thanks to Rob Coup for the bug report. Refs #12504 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 16:34:42 +00:00
2cd48bac7e
Fixed #13358 -- Ensured that db_manager() can be used to override database routing on M2M, reverse FK and generic key queries. Thanks to Craig Kimerer for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 12:29:23 +00:00
94a968cfc6
Fixed #13357 -- Minor changes to get Django running under PyPy. Thanks to Alex Gaynor for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 11:11:55 +00:00
a213599db7
Fixed #9427 : Allow for autodiscover to load admin modules from apps in eggs. Thanks clint and metzen.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 22:32:53 +00:00
a288f97a2a
Add file mistakenly left out of r12986. Refs #13334 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12988 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 20:36:00 +00:00
da36e32224
Fixed #13334 : Restored ability to load template tags from eggs. Again thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule, and Russ for review.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 19:57:09 +00:00
4604e985ae
Fixed #13353 : Corrected a couple of tests that were dependent on dictionary ordering. Thanks Alex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12984 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 19:11:02 +00:00
29341aaffc
Fixed #13348 : Restored ability to load models from apps in eggs. Thanks Ramiro and metzen for pointers on how to find out if a module loaded from an egg has a particular submodule.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 18:44:51 +00:00
9ac4d2fc61
Fixed a test failure under Postgres caused by primary key sequence allocation.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 14:43:40 +00:00
07590ff4e8
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.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 14:34:40 +00:00
442ee687df
Fixed #13349 -- Ensure that raw queries evaluate the entire query if the backend doesn't support chunked reads. Thanks to Alex Gaynor for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 13:01:51 +00:00
2faa3acb4b
Fixed #13328 -- Added a __getstate__/__setstate__ pair to fields so that callable default values aren't pickled. Thanks to bkonkle for the report, and Vitaly Babiy for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 12:41:08 +00:00
d9aaad4e36
Fixed #13352 -- Added __repr__ method for Validation Error. Thanks to elpaso66 for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 11:19:59 +00:00
1cec641669
Fixed Python 2.4 incompatibility introduced in r12972.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-14 21:23:43 +00:00
48dd5f13a3
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/trunk@12972 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-14 19:10:27 +00:00
d8910e95e0
Fixed #13345 : Don't attempt to load the locale regressiontests subdirectory as a Django app. Thanks ramiro.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-14 18:17:44 +00:00
e93f56b174
Fixed #13227 -- Ensure that the query cache is flushed when a QuerySet is deepcopied, avoiding problems when an evaluated queryset is used as a subquery. Thanks to claudep for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 15:18:10 +00:00
b3390fede0
Fixed #13290 - Added a section about minification of admin JavaScript files to the contributing docs. Thanks to Gabriel Hurley for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 10:29:44 +00:00
31f7ff1518
Fixed #12903 - Made translating the admin action selection text easier. Thanks to Ramiro Morales for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 10:29:19 +00:00
c3d1267c15
Also minify the JavaScript file for pre-populated form fields in the admin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 10:28:44 +00:00
1fcf747b13
Fixed #12882 - Moved the admin's jQuery into our own namespace to lower the risk of a clash with third party apps that use jQuery.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 10:28:24 +00:00
35f4150734
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.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 02:41:37 +00:00
b7b38a41b0
Fixed #13229 -- Corrected a test failure caused by the change in Finnish municipalities from r12958. Thanks to Karen for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12962 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 23:53:27 +00:00
217a379c3d
Fixed #13229 -- Updated the list of Finnish municipalities in localflavor. Thanks to Haprog for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:59:00 +00:00
2a752edd80
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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:36:48 +00:00
2cebe4395e
Refs #13167 -- Corrected a regression in the way non-existent variables are handled by {% if %} tags. Thanks to ohmi2 for pointing out the regression in 1.2, and Karen for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 13:56:38 +00:00
55c31fbdef
Fixed #11696 : Changed app loading code so that it does not swallow import errors that used to be (prior to r10088) raised.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 12:39:18 +00:00
82b8b67446
Fixed #9437 -- Now close the connection after getting the PostGIS version during spatial backend initialization.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 18:59:03 +00:00
faceca7075
Fixed #13301 -- Corrected problem with capitalization of changelist row headers in admin. Thanks to emyller for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 08:35:04 +00:00
f4c76fb604
Fixed #13298 -- Modified test assertion to ensure that javascript variables aren't mistakenly identified as <input> HTML tags. Thanks to mk for the report and fix.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 06:58:33 +00:00
736afb4705
Fixed #13319 -- Modified the default verbosity level for "no fixtures loaded" messages. Thanks to chtito for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 06:50:53 +00:00
aed032d0ac
Fixed #13311 -- Modified the tag library import process so it doesn't mask import errors in the tag library itself. Thanks to amccurdy for the report, and Alex Gaynor for the suggested fix.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 06:48:46 +00:00
b579350cd1
Fixed #13275 -- Modified the parsing logic of the {% url %} tag to avoid catastrophic backtracking. Thanks to SmileyChris for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-10 07:35:31 +00:00
f4eac3d87f
Minor documentation tweaks for GeoDjango, including addition of link to main index, and removal of unsupported `:download:` directives.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-09 20:51:01 +00:00
040c18b17e
Fixed #13309 -- Ensure that delete() deletes everything it should delete(). Thanks to craig.kimerer@gmail.com for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-09 13:24:13 +00:00
7b47609629
Fixed #13308 -- Ensured that dumpdata correctly interacts with router allow_syncdb directions. Thanks to Francis (wizard_2) for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-09 13:08:08 +00:00
e9bbdb39de
Fixed #13293 -- Corrected a problem with the MySQL handling of boolean return values when a query has an extra() clause. Thanks to mk for the report and draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-09 12:39:08 +00:00
056c940f0d
Fixed #13304 -- Updated auth decorators so they can be used with callable classes. Thanks to Horst Gutmann for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-09 11:07:17 +00:00
736b751ed9
Fixed #13068 , #9264 , #9983 , #9784 - regression with pre-populated fields and javascript inlines, and related bugs.
...
Thanks to hejsan for the report, and to Sean Brant and Carl Meyer for the patch.
#13068 is a regression caused by the new javascript inline forms in the
admin. The others were existing javascript bugs with prepopulated fields.
Since the solution depends on jQuery and would likely be very hard to
backport without it, it will not be backported to 1.1.X.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-07 23:37:48 +00:00
97b9c7582b
Fixed #13099 - incorrect SQL for `exclude()` example
...
Thanks to istruble for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 14:35:36 +00:00
520ce1bab3
Fixed #13270 - typos in documentation
...
Thanks to cmbeelby for the report and patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 14:18:32 +00:00
Karen Tracey
Russell Keith-Magee
Jacob Kaplan-Moss
Jannis Leidel
Justin Bronn
Brian Rosner
Luke Plant