Commit Graph

1312 Commits

Author SHA1 Message Date
Russell Keith-Magee 3fb57d47bd Fixed #13328 -- Ensured that querysets on models with callable defaults can be pickled. No, really this time. Thanks to Alex for his help brainstorming the solution.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-21 16:34:33 +00:00
Russell Keith-Magee e8eac32901 Fixed #13389 -- Ensured that the app_loading test clears out the app cache at the end of each test, so that it doesn't interact badly with flush and other introspected database commands. Thanks to Karen for the report, and Ramiro Morales for the debugging hints.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-21 12:05:15 +00:00
Russell Keith-Magee b131561112 Fixed #13374 -- Modified a test so that it can pass under PyPy. This is a reimplementation of part of r12998, reverted in r13008. Thanks to Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-21 11:33:39 +00:00
Karen Tracey 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Jannis Leidel 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Karen Tracey 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Karen Tracey 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
Karen Tracey 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
Russell Keith-Magee 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
Jannis Leidel 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
Russell Keith-Magee 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
Brian Rosner 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
Russell Keith-Magee 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
Karen Tracey 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 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
Russell Keith-Magee 90d112785b Fixed #13038 -- Ensured that readonly fields in the admin have their name added as a CSS class. Thanks to andybak for the report, and javimansilla, fisadev and fgallina for their work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 15:37:43 +00:00
Russell Keith-Magee c421a4fd92 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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:02:27 +00:00
Karen Tracey 4e4decaf42 Tweaked a test model in delete_regress to avoid having a column name that causes a failure on Oracle.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-04 17:42:23 +00:00
Russell Keith-Magee 37861cf7eb Fixed #13082 -- Slight modification to an Oracle test to avoid a problem cause by teardown behavior. Thanks to stvsmth for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-04 17:06:13 +00:00
Russell Keith-Magee 82efb48403 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).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-04 17:05:43 +00:00
Russell Keith-Magee 5e5203c7d7 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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-02 15:44:48 +00:00
Russell Keith-Magee db5be42c12 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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 15:16:26 +00:00
Russell Keith-Magee 271bcda04a Fixed #7190 -- Corrected a problem with Boolean value handling on the MySQL backend. Thanks to George Vilches for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 15:10:53 +00:00
Russell Keith-Magee 4e5c20b78b 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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 13:43:22 +00:00
Russell Keith-Magee a75dc3406f Fixed #13250 -- Corrected a problem with the use of routing rules on the create() call on a Foreign Key. Thanks to chris@xlevus.net for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 12:33:10 +00:00
Russell Keith-Magee dafc077e4a Fixed #12945 -- Corrected the parsing of arguments in {% url %} when the argument list has spaces between commas. This is a revised version of r12503, which was a fix for #12072. Thanks to SmileyChris for the patch, and to dmoisset for finding all the places in the docs that the old style syntax was used.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-30 12:44:30 +00:00
Russell Keith-Magee aa53876610 Fixed #13239 -- Forced the deletion of the Popen object, avoiding a bug in Python's subprocess cleanup code.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 07:24:45 +00:00
Jannis Leidel aba95dcc0b Fixed #13023 - Removed ambiguity with regard to the max_num option of formsets and as a result of admin inlines. Thanks to Gabriel Hurley for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 23:03:56 +00:00
Jannis Leidel ca4c6f65ea Fixed #13032 - Added localize parameter to form fields to be able to selectively enable localization.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 16:43:27 +00:00
Russell Keith-Magee ad5afd6ed2 Fixed #12769, #12924 -- Corrected the pickling of curried and lazy objects, which was preventing queries with translated or related fields from being pickled. And lo, Alex Gaynor didst slayeth the dragon.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 15:54:31 +00:00
Russell Keith-Magee b31b2d4da3 Fixed #13227 -- Modified ForeignKeys to fully honor the db_prep/prep separation introduced by multidb. This was required to ensure that model instances aren't deepcopied as a result of being involved in a filter clause. Thanks to claudep for the report, and Alex Gaynor for the help on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 15:16:27 +00:00
Gary Wilson Jr 84de614529 Fixed #13174 -- Fixed missing field label for `readonly_fields` when used in `StackedInline`, thanks to benc for the report and ptone for the investigation and initial patch.
* Corrected `InlineAdminForm.__init__` to pass along `model_admin` parameter in `super` call.
 * Lookup the field label in the form's model, not the `model_admin` model.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@12857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 23:38:05 +00:00
Russell Keith-Magee 667ced2abc Fixed #12594 -- Ensured that a meaningful exception is raised when the urlconf_module is None. Thanks to buriy for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 15:08:24 +00:00