Commit Graph

7875 Commits

Author SHA1 Message Date
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 6e60c8b7c0 [1.1.X] Fixed #13171 -- Corrected the field_subclassing unit test. Thanks to Gabriel Hurley for the report and patch.
Backport of r12838 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 14:21:14 +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 c2267602cb [1.1.X] Fixed #12764: Avoid exceeding psycopg1 limits in the views tests.
r12832 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12833 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-22 13:29:26 +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
Justin Bronn 6943950dfd [1.1.X] Fixed `fieldlookup` docs cross-reference directive, and added it to the queryset reference. Refs #12930.
Backport of r12808 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 05:04:54 +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
Gary Wilson Jr 58d72d4fee [1.1.X] Fixed #10361 -- Added documentation for ComboField and MultiValueField form fields, patch from timo.
Backport of r12798 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 21:03:11 +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 9b85ef2895 [1.1.X] Added a transaction rollback needed to clean up after the test introduced by r12764.
Backport of r12788 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 13:00:24 +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 ef92f4fdd9 [1.1.X] Made a Python 2.3 compatibility test fix.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-14 20:30:18 +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
Karen Tracey 705d6cce0f [1.1.X] Python 2.3 doesn't do decorators.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-11 14:14:07 +00:00
James Bennett 0b78ce8214 [1.1.X] Corrected a markup error in middleware docs. Backport of applicable bits of [12759] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-11 09:43:08 +00:00
James Bennett 47bdb67030 [1.1.X] Fixed #13084: Corrected typo in error-reporting docs. Backport of [12757] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-11 09:34:18 +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 0cac2cbc2f [1.1.X] Updated svnmerge metadata to reflect changesets that have been and should not be merged.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 20:53:51 +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
Karen Tracey 9bdfe1765f [1.1.X] Move the tests added for #12302 to where some other tests for debug page responses already existed.
r12723 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 15:23:52 +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 9b2ac2ad2d [1.1.X] Made a few Python 2.3 compatibility test fixes.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 04:37:45 +00:00
Russell Keith-Magee 1adc88f4b4 [1.1.X] Fixed #12097 -- Cleaned up the documentation for ModelChoiceField and MultipleModelChoiceField. Thanks to JasonYosinski for the patch.
Backport of r12712 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 03:27:12 +00:00
Russell Keith-Magee fdbf6c881b [1.1.X] Fixed #12114 -- Clarified the existence of the reverse relation _set in the tutorial. Thanks to panfist for the suggestion, and dwillis for the patch.
Backport of r12711 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 03:26:45 +00:00
Russell Keith-Magee ec6f705956 [1.1.X] Fixed #12811 -- Modified Tutorial 2 to indicate that the templating language will be covered later. Thanks to bac for the suggestion, and Gabriel Hurley for the draft text.
Backport of r12710 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 03:26:24 +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
Karen Tracey 90e12662b9 [1.1.X] snvmerge metadata housekeeping.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 17:15:21 +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