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

1134 Commits

Author SHA1 Message Date
Karen Tracey
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
Karen Tracey
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
Russell Keith-Magee
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
Karen Tracey
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
Brian Rosner
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
Russell Keith-Magee
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
Karen Tracey
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Russell Keith-Magee
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
Jannis Leidel
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
Russell Keith-Magee
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
Karen Tracey
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
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
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
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
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
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
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
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
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
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
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