Commit Graph

6771 Commits

Author SHA1 Message Date
Karen Tracey 05d695908c Fixed #9053 -- Allowed for sorting of callable and ModelAdmin methods specified in list_display (added in r8352). Previously attempting to sort on the former would raise an exception and the latter simply didn't sort. Also added tests for this function. Thanks rgl and jenan.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9211 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 14:47:01 +00:00
Malcolm Tredinnick 7e7a370e20 Fixed #9319 -- Fixed a crash when using the same model field in multiple
unique_together constraints.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9208 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 10:09:44 +00:00
Malcolm Tredinnick 559aca7d78 A queryset that has had ordering removed (order_by()) can have ordering added
again later (order_by('foo')). Or, at least, it can now. Thanks to Ilya
Novoselov for diagnosing the problem here.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 09:45:27 +00:00
Malcolm Tredinnick 44f228fd61 Fixed #6748 -- When printing the repr() of querysets, don't load or display
more than 20 objects.

This means that accidentally executing HugeStoryArchive.objects.all() at the
interactive prompt (or in the debug template) won't try to load all 4,233,010
stories into memory and print them out. That would previously cause resource
starvation and other "interesting" crashes.

If you really, really want the previous behaviour (e.g. in a doctest that
prints more than 20 items), display "list(qs)" instead of just "qs".


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9202 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 08:38:33 +00:00
Malcolm Tredinnick 268ef594ac Applying a limit to a queryset that already had an upper limit of 0 wasn't
working properly.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9201 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 08:37:35 +00:00
Malcolm Tredinnick ce770aaecd The tests added in r9184 were altering the test environment in bad ways. Fixed
this with proper setUp() and tearDown() methods.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9200 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 08:36:41 +00:00
Malcolm Tredinnick 70b6c4c015 Fixed #9233 -- Allow date and message-id headers to be passed in manually in
email messages. Previously we were creating duplicate headers, which was bad.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 12:20:01 +00:00
Malcolm Tredinnick 72f387d344 Fixed #9215 -- Added a view/template example of using pagination.
Based on a patch from shacker and Matt Dennenbaum.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 11:51:14 +00:00
Malcolm Tredinnick 08c3ad0cd0 Added a link to the "documentation" documentation in the contributing docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 11:49:50 +00:00
Malcolm Tredinnick 777aaf0333 Added a note about where custom manager specifications go in a model (for the
style guide).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 11:48:11 +00:00
Malcolm Tredinnick 2ae36375fc Fixed #9224 -- Prevent a crash when certain query strings are sent using
modpython.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 10:39:16 +00:00
Malcolm Tredinnick cd8eeaacf5 Fixed #5888 -- Added methods to the test client to support HEAD, PUT, DELETE
and OPTIONS support. Thanks Scott Barr and Leah Culver.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 09:23:40 +00:00
Malcolm Tredinnick 30b568226f Fixed #9199 -- We were erroneously only prepending "www" to the domain if we
also needed to append a slash (when PREPEND_WWW=True).

Based on a patch and tests from gonz. Thanks.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 08:22:50 +00:00
Malcolm Tredinnick a928c563e9 Added a lot more explanation about form field validation, including expanded
examples. Fixed #5843, #6652, #7428.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 11:21:11 +00:00
Malcolm Tredinnick 49c61ab1ab Fixed #7011 -- Clarified what User.is_active really means in the documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 11:20:15 +00:00
Malcolm Tredinnick 870a6ec20c Fixed #6979 -- Fixed the documentation cross-reference between the TIME_ZONE
setting and manual settings configuration.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 11:18:30 +00:00
Malcolm Tredinnick 452ba4a8f7 Fixed #8768 -- Clarified that ugettext_lazy() results are unicode proxies and
can't be used as bytestrings.

Still a number of markup changes to be made in this file (and in this
changeset). That's intentional for now, since I'm going to rewrite the file
later this week.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 08:32:35 +00:00
Malcolm Tredinnick fa63f1642d Fixed #8975 -- Added a note to the documentation for reverse() that all views
must be importable for URL reversing to work correctly.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 08:31:32 +00:00
Malcolm Tredinnick cddece2db1 Fixed #9254 -- Added information to the porting guide about the removal of
"core" and the new methods on model file- and image-fields.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 08:30:02 +00:00
Malcolm Tredinnick 8cbf5d102c Fixed #8688 -- Added a note about using a settings variable for the static
media viewer with the development server. Based on a suggestion from trodrigues.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 08:29:05 +00:00
Malcolm Tredinnick e0a09b7dac Fixed a couple of markup errors in the documentation.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 08:28:18 +00:00
Malcolm Tredinnick a011a49457 Fixed #9047 -- Marked up django.core.urlresolvers.reverse() properly in the
docs. It now appears in the index.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 08:27:24 +00:00
Malcolm Tredinnick 8fb1459b52 Added some better error reporting and path handling when creating template paths.
We now raise UnicodeDecodeError for non-UTF-8 bytestrings (thanks to Daniel
Pope for diagnosing this was being swallowed by ValueError) and allow UTF-8
bytestrings as template directories.

Refs #8965.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 06:34:54 +00:00
Malcolm Tredinnick fb62bcc69e Fixed #8321 -- Change django.contrib.auth.models to use django.utils.hashcompat
for consistency with other code. Thanks, magneto.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 05:14:17 +00:00
Malcolm Tredinnick c58c1f43cf Fixed #5753 -- Allow createsuperuser to work in situations where there
might be a valid password database entry for the current user id.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 04:54:14 +00:00
Malcolm Tredinnick e2b02eae10 Fixed #9305 -- Updated Georgian translation from David Avsajanishvili.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 04:19:11 +00:00
Karen Tracey 5d3b222a59 Fixed #9212: Added code to check the xgettext version, and if it is lower than 0.15, undo an incorrect encoding to utf-8 done by xgettext. This bug was fixed in xgettext 0.15, but the most-easily-installed Windows gettext binaries are older (0.13.1), so we work around it.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9155 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-06 01:36:35 +00:00
James Bennett b131462d76 Add note to 1.0 porting guide about removal of dictionary access to HTTP request objects
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 16:03:58 +00:00
Malcolm Tredinnick 2f0be0faae Fixed #8660 -- Small database query optimisation in User.get_profile.
When calling User.get_profile(), we now tell the profile object about the
related User object right away. This can save a database lookup later if
something in the user profile object wants to refer to the user object.

Patch from Mike Malone.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 12:07:10 +00:00
Malcolm Tredinnick 40904d0404 Fixed #9068 -- Fixed a couple of typos in InsertQuery.clone(). Thanks, rush.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 11:55:52 +00:00
Malcolm Tredinnick 2f188334d3 Fixed #9283 -- Deliberately silence one deprecation warning raised by python 2.6.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 11:39:58 +00:00
Malcolm Tredinnick 806ea3a1de Changed the "write your own settings" recommendation to mention that Django
uses tuples, but not making it a recommendation. That might head off the endless
tuples vs. lists debates.

Fixed #8846.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 08:58:17 +00:00
Malcolm Tredinnick e1b7211083 Fixed #9294 -- Removed a (harmless) double conversion to unicode in one form
widget. Patch from nkilday.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 08:51:14 +00:00
Malcolm Tredinnick 0995b63b77 Fixed #8964 -- Added a note that MyISAM may not necessarily be the default
storage engine for MySQL. Some packagers seem to like causing confusion.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:56:15 +00:00
Malcolm Tredinnick 5cd7af58c9 Fixed a typo and clarified how django.core.mail.outbox works in the testing framework. Fixed #9237.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:39:26 +00:00
Malcolm Tredinnick 7e4d2778e6 Added django.contrib.markup to the docs contents page. Thanks, Marc Fargas.
Refs #9237.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:38:59 +00:00
Malcolm Tredinnick e466d2ea53 Fixed #9257 -- Fixed a small mismatch in text in part 2 of the tutorial.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:19:06 +00:00
Malcolm Tredinnick 514fba5b92 Fixed #9291 -- Tweaked a piece of example code slightly to set a good example
for others (now uses an encoding that is guaranteed to work for XML consumers).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:18:41 +00:00
Malcolm Tredinnick 93aec4e44a Fixed #9301 -- Correct a markup typo in the docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:18:08 +00:00
Malcolm Tredinnick d3c6093645 Fixed #9300 -- Typo fix in docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 06:17:29 +00:00
Malcolm Tredinnick 7cec38b076 Fixed #9259 -- Fixed a validation error for Spanish identity card numbers.
Patch from Marc Garcia.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 05:59:04 +00:00
Malcolm Tredinnick cff78c60ac Fixed #8963 -- Use the require_POST decorator instead of doing things manually in one of the comment views. Thanks, zgoda.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 05:10:35 +00:00
Malcolm Tredinnick 645029accb Fixed #9100 -- Added a missing CSS class to a submit button.
Thanks, mordyovits and thejaswi_puthraya.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9120 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 05:09:59 +00:00
Malcolm Tredinnick 8524089769 Add internationalisation support to the comment templates. Fixed #8868, #8905
Thanks to zgoda for a patch that did most of the internationalisation part.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 05:09:21 +00:00
Malcolm Tredinnick 227a93b64f Fixed #8803 -- Allow authenticated users without first_name/last_name values set to post comments.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 05:07:32 +00:00
Malcolm Tredinnick 16d0a615c4 Fixed #8869 -- Fixed comments templates to be well-formed XHTML.
Based on a patch from zgoda.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 05:06:26 +00:00
Malcolm Tredinnick 18f13aeeab Fixed #8879 -- Used ungettext instead of ngettext in the comments framework.
Patch from zgoda.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 05:05:32 +00:00
Malcolm Tredinnick cf34d1f687 Fixed #9141 -- Removed two templates from django.contrib.comments that were not being used.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 05:04:56 +00:00
Malcolm Tredinnick d343aa3022 Altered a failing url template tag test to work more reliably.
There's no guarantee about the order in which ambiguous patterns are resolved.
The solution is "don't do that" and avoid ambiguity.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-05 04:59:55 +00:00
Russell Keith-Magee a855755711 Fixed #9293: Corrected expected test output for the admin_scripts tests, following the changes to --verbosity in 9110. Thanks to Alex for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-04 01:16:30 +00:00