mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-19 07:54:07 +00:00
Code Issues 24 Releases Wiki Activity
11,023 Commits 28 Branches 423 Tags 638 MiB
313fab8623
Commit Graph

11023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Plant
d5803bb5fb More efficient IN clauses for prefetch_related queries by use of sets to eliminate duplicates 
This simply reduces the size of the IN clause in the SQL, which can be
significant in some cases.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-08 13:50:29 +00:00
Julien Phalip
095dbe8804 Made the tests introduced in r16942 use old-style class decoration to run with Python < 2.6. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-08 11:36:05 +00:00
Carl Meyer
b6ad1afa68 Fixed #17011 - Made override_settings modify a decorated class in-place rather than creating a dynamic subclass, so as to avoid infinite recursion when used with super(). Thanks jsdalton for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-08 08:16:17 +00:00
Aymeric Augustin
0f5d69155e Moved myself in the primary authors section. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 16:52:58 +00:00
Luke Plant
64da8eec30 Fixed #17014 - added protection against infinite recursion. 
Thanks to akaariai for the report and tests.

No tests have been added, since unittests for termination are basically
impossible, and the failure condition will take down the developer's machine
in this case. It has been tested against the cases in #17014.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 16:06:02 +00:00
Luke Plant
052a011ee6 Fixed #17003 - prefetch_related should support foreign keys/one-to-one 
Support for `GenericForeignKey` is also included.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 16:05:53 +00:00
Carl Meyer
672f2db24a Corrected backwards middleware-ordering note in flatpage documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 15:48:30 +00:00
Carl Meyer
3f3010014b Fixed #14678 -- Added validation to catch flatpages with the same URL on the same site. Thanks seler for the report, and joni, graham_king, and j4nu5 for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 15:45:52 +00:00
Aymeric Augustin
846fc7260a Fixed typo in r16935. Refs #17012. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 15:33:55 +00:00
Aymeric Augustin
510ea906f7 Fixed #17012 - Removed references to the 'hasNoProfanities' validator. Refs #8794. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 08:35:20 +00:00
Carl Meyer
b1b1da1eac Fixed #8060 - Added permissions-checking for admin inlines. Thanks p.patruno for report and Stephan Jaensch for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 00:41:25 +00:00
Aymeric Augustin
e2f9c11736 Fixed #16705 - Made the test client adhere to the WSGI spec -- in particular, removed the assumption that environ['QUERY_STRING'] exists. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-06 20:39:15 +00:00
Carl Meyer
9279dce1fe Fixed #16988 - Clean up the deprecation timeline for language consistency. Thanks ptone. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-06 17:31:18 +00:00
Luke Plant
b763412aa4 Removed ForeignRelatedObjectsDescriptor.RelatedManager.delete_manager, which has been unused since [14507] 
And cleaned up the result, allowing more consistency with the other related
descriptors.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-06 11:08:11 +00:00
Luke Plant
662eea116f Fixed #16937 - added QuerySet.prefetch_related to prefetch many related objects. 
Many thanks to akaariai for lots of review and feedback, bug finding,
additional unit tests and performance testing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-05 23:14:52 +00:00
Luke Plant
d30fbf8b78 Fixed #16902 - select_related() results in a poor perfomance 
Thanks to ivan_virabyan for the great patch!

(For the record, some very small tweaks were made by me).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-05 22:56:09 +00:00
Julien Phalip
03d4a8d1b6 Fixed #16990 -- Fixed a couple of small docstring typos in the django/test/testcases.py module and did some minor cleanup while I was in the area. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16928 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-05 12:50:44 +00:00
Luke Plant
05cf72bace Very small docstring correction. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-05 09:54:01 +00:00
Paul McMillan
1ac2bb9b8e Fixed #16987 -- Improved error message for session tests. Thanks jMyles and DiskSpace for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-05 05:21:47 +00:00
Alex Gaynor
749f0721c4 Fixed #16985 -- corrected a few grammar errors in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-04 23:54:12 +00:00
Aymeric Augustin
2a044732f6 Fixed #16971 - Made the parsing of javascript files by 'makemessages' much faster. Thanks Antti Haapala for the implementation and Ned Batchelder for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-04 20:11:41 +00:00
Aymeric Augustin
f3304d3310 Added self to committers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-04 05:57:51 +00:00
Julien Phalip
c2b9f6496e Added some sphinx cross-reference links to the built-in template tags and filters in multiple areas of the documentation. Also fixed a few minor inconsistencies and did a little PEP8 cleanup while I was at it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-03 08:06:01 +00:00
Ramiro Morales
0d9b6a5bc4 Fixed #10841 -- Switched response served when DEBUG=True and request.is_ajax() returns True (indicating request has been generated by a JS library) to a plain text version for easier debugging. 
Contents of this response are similar to its HTML counterpart modulo frame variables values in the Python traceback section.

Thanks to Riz for the report, to SmileyChris for the patch and to Julien for reviewing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-02 02:53:58 +00:00
Luke Plant
28ee7a9df3 Attempted to sort new features in 1.4 release notes into related topics 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-01 15:43:01 +00:00
Ian Kelly
21a449168b Fixed #16645: fixed a broken test to work in Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 21:40:56 +00:00
Ramiro Morales
bf05da876a Fixed #8160 -- Made sure modelformset_factory takes in account fields' and exclude` ModelForm options. 
Thanks Andrew McMurry for the report and Claude Paroz for creating these tests.

(Actually, this had been fixed in r10619 but the tests added then exercise the
code in the context of ModelAdmin. This commit adds more generic tests.)

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 20:53:39 +00:00
Luke Plant
10d90cba83 Fixed #16935 - misleading message if AttributeError escapes during SimpleTemplateResponse.render 
Thanks to isagalaev for the report.

As discussed on django-devs, this reverts some of the changes in [16568]
i.e.  the addition of `SimpleTemplateResponse.__getattr__`, because this
makes it much harder to debug the common case of an AttributeError somewhere
during the rendering of a SimpleTemplateResponse.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 11:46:23 +00:00
Luke Plant
5009e45dfe Fixed #14270 - related manager classes should be cached 
Thanks to Alex Gaynor for the report and initial patch, and mrmachine for
more work on it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 10:41:25 +00:00
Jannis Leidel
2eadc418af Fixed doc references to django.db.models.query.QuerySet and converted some tabs that were introduced in r16699 to spaces. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 10:28:39 +00:00
Luke Plant
ec5bfed57a Made GenericRelatedObjectManager consistent with other related managers w.r.t. use of core_filters attribute. 
Previously it had an unused keyword argument.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-29 15:30:37 +00:00
Luke Plant
6d6fe61bf6 Cleanups to related manager code, especially in use of closures. 
The related manager classes are defined within functions, and the methods
had inconsistent and confusing usage of closures vs. parameters on self to
retrieve needed information. Everything is stored on self now.

Also some methods were not using super() where they should have been.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16913 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-29 15:30:29 +00:00
Luke Plant
e3a6ac8f60 Small cleanups of 'related manager' code for consistency 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-29 15:30:19 +00:00
Julien Phalip
804e32fae0 Fixed #16949 -- Fixed a small typo in the GIS tutorial and also made some minor PEP8 fixes and added some code-block directives while I was at it. Thanks to jgomo3 for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-28 14:00:43 +00:00
Paul McMillan
c340f6aa4d Fixed incorrect pluralized argument in Files docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-28 02:26:12 +00:00
Julien Phalip
aaf8a31e5d Brushed up the custom template tag 'howto' guide by moving the assignment_tag doc to a more appropriate place (i.e. under the "Setting a variable in the context" section), adding cross references, fixing a few minor inaccuracies and doing a little PEP8 cleanup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-27 13:56:10 +00:00
Julien Phalip
8137027fd7 Fixed #13956 -- Enabled *args and **kwargs support for simple_tag, inclusion_tag and assignment_tag. Many thanks to Stephen Burrows for the report and initial patch, to Gregor Müllegger for the initial tests, to SamBull for the suggestions, and to Jannis Leidel for the review and PEP8 cleanup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-27 12:15:15 +00:00
Luke Plant
29b8e34dfb Removed unused parameter 'join_table' in various bits of RelatedManager code 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-26 17:20:20 +00:00
Ramiro Morales
0febe3b5bb Tweaked the formwizard docs a bit more. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-26 11:24:38 +00:00
Alex Gaynor
11c1e61b99 Fixed #16925 -- Make sure a signal is disconnected if the test fails. Thanks to aaugustin for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-26 10:11:18 +00:00
Ramiro Morales
735fbcfe8b Fixed #16597 -- Added Sphinx cross-reference metadata to the form wizard docs. Thanks FunkyBob for the report and jkistler for the patch. 
Also, additional fixes in that document and in the WizardView docstrings.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-26 01:37:57 +00:00
Ramiro Morales
3ef1762cb9 Fixed #16924 -- Corrected date template filter handling of negative (West of UTC) timezone offsets. 
The 'O' format specifier output was incorrect. Thanks mrgriscom and Aymeric Augustin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-25 17:08:31 +00:00
Julien Phalip
482388cd61 Fixed #16927 -- Corrected the {% ifchanged %} template tag's documentation. Thanks to sebastian for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-25 05:21:29 +00:00
Ramiro Morales
4c457bca85 Fixed #16789 -- Added names to URLs in convenience contrib.auth urls.py. 
Thanks wim AT go2people DOT nl for the report, cmheisel for the patch and
fcurella for reviewing it.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-24 19:48:27 +00:00
Jannis Leidel
ce9e3b4e97 Fixed a regression introduced in r16897. Thanks to Julien for the eagle eyes and Florian Apolloner for the review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-24 13:32:57 +00:00
Julien Phalip
f2ed107b07 Simplified the admin changelist multi-sort interface specifically by removing the popup window, adding explicit tooltip help texts, improving the hover visual states and allowing all operations (i.e. removing a column from sorting and toggling the sorting with and without changing the sorting priority) to be actionable with just one click. Many thanks to Idan Gazit for the feedback and direction. Refs #16212. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-24 06:17:53 +00:00
Ramiro Morales
b1c3174cfa Removed unused code from admindocs app now that it supports reversing URLs. 
As a consequence the undocumented `ADMIN_SITE_ROOT_URL` setting isn't used anymore.

Refs r8718 and r16857.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-23 23:57:06 +00:00
Jannis Leidel
6cae2a550d Fixed #16878 -- Improved intword filter to support numbers up to decillion and googol. Thanks to crodjer for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-23 16:45:40 +00:00
Jacob Kaplan-Moss
33ad413c1c Test commit - please ignore. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-23 16:33:52 +00:00
Carl Meyer
0a9c52e013 Fixed #16917 -- Don't try to use the model name for a ContentType's unicode representation if the model no longer exists. Thanks Ivan Sagalaev for report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-23 04:22:30 +00:00