mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-13 16:59:35 +00:00
Code Issues 32 Releases Wiki Activity
7,712 Commits 30 Branches 459 Tags
Commit Graph

1552 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Joseph Kocherhans
e8c768910a [1.1.X] Fixed #12913. Fields with choices now respect show_hidden_initial as a keyword argument to formfield. Backport of r12696 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-07 01:52:48 +00:00
Joseph Kocherhans
55bcc8ac30 [1.1.X] Fixed #12734. Deferred fields will now be properly converted to python when accessed. Backport of r12579 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-06 19:17:29 +00:00
Karen Tracey
daec734584 [1.1.X] Fixed #6918, #12791: If an email message has an encoding, actually use that encoding to encode body and headers. Thanks for patch with tests oyvind. 
Backport of r12683 and r12688 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-06 16:07:05 +00:00
Karen Tracey
215615ad58 [1.1.X] Fixed #12151: Ensured the comments code does not cause a server error when a request comes in for a comment specifying an invalid primary key value. Thanks thejaswi_puthraya. 
r12681 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-05 20:21:28 +00:00
Karen Tracey
b5a2f64cbb [1.1.X] Fixed #12083: Ensured generating debug 404 page won't raise a key error. Thanks pigletto. 
r12679 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-05 18:58:47 +00:00
Karen Tracey
cc65ac9e2b [1.1.X] Fixed the files test to not care whether the names are reported as bytestrings or unicode. Refs #12898. 
r12676 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-03 13:46:40 +00:00
James Bennett
faa341e61b [1.1.X] Expanded the fix in [12663] to cover CSS declarations, which were also affected by the bug. Refs #12879. Backport of [12665] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-03 08:19:23 +00:00
James Bennett
1d12aa2cfe [1.1.X] Fixed #12879: Declaring the same JS file multiple times in a single Media instance now only includes that file once. Backport of [12663] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-03 08:03:47 +00:00
Karen Tracey
c6e662cd6e [1.1.X] Fixed #12898: Reverted a change that assumed the file system encoding was utf8, and changed a test to demonstrate how that assumption corrupted uploaded non-ASCII file names on systems that don't use utf8 as their file system encoding (Windows for one, specifically). Thanks for the report to vrehak. 
r12661 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 22:02:02 +00:00
Karen Tracey
b50b3cf75c [1.1.X] Fixed #11522: Restored ability of http redirect responses to correctly handle redirect locations with non-ASCII chars. 
r12659 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 19:41:39 +00:00
Russell Keith-Magee
755a0f6d96 [1.1.X] Fixed #6510 -- Refactored the way child nodes are found in template nodes to avoid potential inconsistencies. Thanks to SmileyChris for the patch. 
Backport of r12654 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 07:47:41 +00:00
Karen Tracey
69fb5c25bd [1.1.X] Fixed #11710: Made a small test change to ensure utf-8 bytestrings in verbose_names don't cause a server error when the admin change log message is built. The necessary code fix was made for #12966 in r12627. Thanks Rupe. 
r12650 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 03:32:49 +00:00
Karen Tracey
08a698ed46 [1.1.X] Fixed #11465: Ensure nonexistent pks enterd in an admin raw id field do not 
cause a server error. Thanks for report and initial patch sacre@wp.pl. 

Backport of r12648 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-02 02:39:26 +00:00
Jacob Kaplan-Moss
7e1c67040c [1.1.X] Fixed #11012: don't needless convert cache values to unicode. 
This means you can now successfully store binary blogs, such as compressed data,
in the cache.

Thanks to Matt Croydon for the final patch.

Backport of [12637] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 20:14:18 +00:00
Karen Tracey
5f3a53036d [1.1.X] Fixed #11791: Put hidden input elements in the change list inside td elements so they're valid HTML. Thanks panni and mlavin. 
r12631 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 18:46:20 +00:00
Karen Tracey
1b2b3b0dba [1.1.X] Fixed #12302: Modified force_unicode to avoid raising unicode errors when 
handed exceptions with non-ASCII bytestring data and no working unicode method
under Python 2.6 and higher.

r12621 and r12622 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-28 15:29:14 +00:00
Karen Tracey
e0679ef165 [1.1.X] Removed more stray tabs in Python files. 
Applicable parts of r12616 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-27 16:37:32 +00:00
Justin Bronn
499c715513 [1.1.X] Fixed #12608 -- No longer return inconsistent results when using values and values_list in conjunction with annotate. Thanks, Charlie Leifer. 
Backport of r12505 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 17:11:58 +00:00
Jannis Leidel
7c23a5303c [1.1.X] Fixed #5971 - Fixed inconsistent behaviour of the TokenParser when parsing filters that follow constant strings or variables. Thanks Dmitri Fedortchenko, Adam Vandenberg and Ramiro Morales. 
Backport of r12471.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 17:00:42 +00:00
Jannis Leidel
079d9f3738 [1.1.X] Fixed #11384 - Make sure translations in the project directory really override translations in apps as specified in the docs. 
Backport of r12447.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 17:00:11 +00:00
Karen Tracey
14fbee6958 [1.1.X] Added force_unicode to a test (needed for Python 2.3 compatibility). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 16:40:37 +00:00
Russell Keith-Magee
b6bd766d88 [1.1.X] Fixed #1480 -- Added the ability to use the system timezone. Thanks to Ramiro Morales for the patch. 
Backport of r12602 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 15:38:50 +00:00
Russell Keith-Magee
3bda1f5bd3 [1.1.X] Fixed #6191, #11296 -- Modified the admin deletion confirmation page to use the same object collection scheme as the actual deletion. This ensures that all objects that may be deleted are actually deleted, and that cyclic display problems are avoided. Thanks to carljm for the patch. 
Backport of r12598 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 13:43:28 +00:00
Russell Keith-Magee
a52f1dd95c [1.1.X] Fixed #11226 -- Corrected an validation edge case with m2m relations between two models with the same class name. Thanks to pkoch for the report, and to Ramiro Morales for the patch. 
Backport of r12489 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-26 11:12:14 +00:00