Commit Graph

10770 Commits

Author SHA1 Message Date
Malcolm Tredinnick 77189afb7f Slightly rewrite @permalink and get_absolute_url() documentation.
Part 2 of the model instance documentation changes. Slightly tidied up
get_absolute_url() and @permalink documentation to collapse some of the
earlier versions into a preferred learning order. I'm still not
amazingly happy with this, but larger rewrites are needed to the URLconf
stuff across a few files before I can get it into the most natural
order, I suspect. That's a slightly longer-term project.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-28 02:05:32 +00:00
Malcolm Tredinnick a0eb58e90b Documentation edits for model instance docs.
First of two parts. Mostly adding cross references to other parts of the
documentation.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-28 02:05:20 +00:00
Chris Beaven f85b96121a Fix a small thread safety issue in ExtendsNode. No tests, but Malcolm said that's ok, honest.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-27 04:55:02 +00:00
Malcolm Tredinnick 4c8f2dca21 Extensive copy-editing and cross-referencing in the queryset API docs.
Been meaning to do this for a long time. Mostly, this is a lot of
additions of cross references. Within a particular section about foo() I
didn't cross-link foo() calls to itself, but everything else was
cross-linked to its main documentation.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-27 02:56:18 +00:00
Julien Phalip 17ceb9b98a Fixed #16712 -- Fixed a small typo in the QuerySet API docs. Thanks to Rupe and Aymeric Augustin for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 23:37:07 +00:00
Malcolm Tredinnick a4a250a296 Corrected explanation of values() and extra() interaction in querysets.
Fixes #15546, refs #13455. The original documentation patch
inadvertently muddied the waters in one aspect and this commit tidies
that up.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 21:13:01 +00:00
Malcolm Tredinnick e0ae9db272 Small typo fix for how to claim a ticket in Trac.
Patch from Audrey Roy, fixes #16670.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 09:44:40 +00:00
Malcolm Tredinnick 1154b80a64 Added placeholder release notes for the 1.2.1 and 1.2.3 releases.
Both of these releases were to fix bugs in the previous release and, as
such contained nothing new of significance. However, to complete the set
of release note files in case anybody worries about the gaps, we now
have documents explaining precisely that.

Fixed #15330.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 09:31:01 +00:00
Malcolm Tredinnick 4d21511961 Clarify the documentation around SQLite and case-sensitive string matching.
This was still causing some confusion, so I rewrote the section in the
database notes to encompass both substring matching and non-ASCII
case-insensitive equality checks, as well as putting in a stronger
callout on the "contains" filter.

Refs #16569.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 08:42:38 +00:00
Malcolm Tredinnick c9da5db701 Fixed documentation about use of salt parameter in signing functions.
Fixes #16369.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 08:18:05 +00:00
Malcolm Tredinnick 70e59aeaf8 Be very clear about when it's appropriate to use defer() and only().
I've been seeing a bit of over-reliance on defer() and only() in code
around the place and it's generally better modelled with normalised data
or shadow (unmanaged) models. This commit makes this position clearer.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 06:19:30 +00:00
Malcolm Tredinnick 499f01842e Add a note about discouraging whitespace- or formatting-only patches.
We follow the python-dev path here. Deliberately.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 05:28:58 +00:00
Julien Phalip 3e65f9633b Further improved on the work done in r16622 by making the help text icons look hoverable in the admin tabular inline headers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 04:36:31 +00:00
Adrian Holovaty 804a6db86e Added a bit to 'Saving ManyToMany Fields' explicitly explaining how to add multiple relations in one statement
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 04:34:40 +00:00
Julien Phalip 5eeb2d56d5 Added some tips to the contributor docs, namely about removing trailing whitespaces and about mentioning relevant ticket numbers in tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-26 02:43:33 +00:00
Julien Phalip bf9ba45f6b Fixed #16677 -- Fixed the future version of the ssi template tag to work with template file names that contain spaces. Note that this fix cannot be applied to the currently deprecated version of the ssi tag since it requires an unquoted literal as parameter. Many thanks to Aymeric Augustin for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-25 23:02:15 +00:00
Malcolm Tredinnick bb99fe46b7 Fix test from r16678 and r16681 properly for Oracle.
Fixes #16694, with thanks to aagustin for the Oracle testing and
tweaking.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-25 09:23:49 +00:00
Jannis Leidel b0764e81ad Documented `translation.override` context manager introduced in r16166.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-25 09:20:44 +00:00
Julien Phalip 7e66ccac4c Fixed a small admin CSS issue where the "Save and continue editing" and "Save and add another" buttons were wrongly aligned with left-to-right languages in IE7.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-25 08:01:21 +00:00
Malcolm Tredinnick 587fbff3dd Make ManyToManyField model references more robust.
In r16679 a test was added to verify something had been fixed when a
unicode string type was passed in as a model name. The name has to be
ASCII convertible, but in Python 2.6 and earlier, it must also have str
type.

This commit fixes the problem for earlier Python versions and is almost
identical to a patch from b.leskes in #6045.

Fixes #16689. Refs #6045.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-25 06:07:28 +00:00
Malcolm Tredinnick 20473057d1 Modify validity check from r16678 slightly to work with Oracle.
We now skip this particular check on Oracle backends. Change is based on
a backend feature check, so it also works with other backends that may
treat NULL as equal to an empty string.

Fixes #16694 (with luck).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-25 05:44:18 +00:00
Julien Phalip a3fd9cf288 Fixed #15837. Consolidated all the locaflavor tests into a single, logical, place (regressiontests/localflavor/).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-24 12:30:59 +00:00
Malcolm Tredinnick ec1226b83f Added another test to confirm fix in r16663.
This is the test case from #6045, which was fixed by the above commit.
Refs #6045, #16299

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-24 03:51:33 +00:00
Malcolm Tredinnick 75ddbf77a6 Teach "django-admin.py validate" to forbid nullable primary keys.
Fixes #15884, with thanks to JustinTArthur and Julie Pichon.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 23:43:29 +00:00
Russell Keith-Magee 8b87a94357 Corrected the setup and teardown of the refactored invalid_models test so that it guarantees that stdout is restored, and purges all the temporary models from the app cache after running the test.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 15:36:40 +00:00
Russell Keith-Magee be4acff319 Reverted r16662 -- There are bunch of problems with this patch, including failing tests, that I didn't pick up before committing.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 06:31:03 +00:00
Malcolm Tredinnick 7182cd2284 Allow "pk" as a field alias in QuerySet.only() calls.
Thanks to GDorn for the patch. Fixed #15494.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 06:29:01 +00:00
Malcolm Tredinnick a86dde20f0 Fixed a broken test from r16656.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 06:28:45 +00:00
Julien Phalip 6feb611c7b Fixed #16669 -- Made the startproject instruction formatting easier to read and more consistent with other formatting in the tutorial part 1. Thanks to Daniel Lawrence and Aymeric Augustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 05:24:31 +00:00
Russell Keith-Magee a39066ba0b Fixed #16299 -- Ensure that unicode strings can be used to identify classes in ForeignKey and ManyToManyFields. Unicode strings aren't actually legal as class names, but this is an issue if you use from __future__ import unicode_literals in your models.py file. Thanks to Martijn Bastiaan for the report, and Anthony Briggs for the final patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 05:12:31 +00:00
Russell Keith-Magee 43024142a1 Fixed #16202 -- Added a Slovenian localflavor. Thanks to Jure Cuhalev <gandalf@owca.info>, Gasper Zejn, Domen Kozar and iElectric for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 04:41:56 +00:00
Russell Keith-Magee 1e72b1c5c1 Fixed #16681 -- Refactored the invalid_models unit test so that it can be invoked manually. Thanks to Anthony Briggs for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 04:25:07 +00:00
Julien Phalip 966bbd4d56 Fixed #16680 -- Used single quotes for the TEMPLATE_DIRS examples in part 2 of the tutorial to be consistent with the settings.py file generated by the startproject command. Thanks, Michael Tomkins.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 04:10:15 +00:00
Russell Keith-Magee a5cbb892f8 Fixed #15315 -- Added support for the 'widget' argument to modelform_factory. Thanks to SardarNL and Will Hardy for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 04:08:24 +00:00
Malcolm Tredinnick 1f770c62da Fix initialisation of ImageField super classes.
Fixes #16548, with thanks to pyriku.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 04:05:47 +00:00
Russell Keith-Magee 6cd9023635 Fixed #15499 -- Ensure that cache control headers don't try to set public and private as a result of multiple calls to patch_cache_control with different arguments. Thanks to AndiDog for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 03:51:10 +00:00
Malcolm Tredinnick 2e56066a5b Fixed an isnull=False filtering edge-case. Fixes #15316.
The bulk of this patch is due to some fine analysis from Aleksandra
Sendecka.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 03:38:42 +00:00
Malcolm Tredinnick c3a0dcf6e9 Added convenience method for viewing Query SQL without params.
This is the old Query.as_sql() method revived: it's like Query.__str__,
but the parameters aren't substituted into the placeholders. Thus, it's
a more accurate representation of the SQL the (default) backend will
see. Entirely internal.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 03:38:28 +00:00
Malcolm Tredinnick 0686c6b0ee Add the ability to do unordered comparisons in assertQuerysetEqual.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 03:38:18 +00:00
Russell Keith-Magee 2664fa1896 Fixed #15838 -- Promoted assertFieldOutput to a general test utility. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 02:32:37 +00:00
Julien Phalip 46ef2983ba Added myself to the list of committers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 01:41:47 +00:00
Russell Keith-Magee d310f91ee7 Fixed #10571 -- Factored out the payload encoding code to make sure it is used for PUT requests. Thanks to kennu for the report, pterk for the patch, and wildfire for the review comments.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 00:52:45 +00:00
Russell Keith-Magee 0f767f9a99 Fixed #16672 -- Ensure that test classes decorated with @override_setings gets the right name when running the tests. Thanks to Julien Phalip for the report and initial patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 00:32:35 +00:00
Malcolm Tredinnick b9244cfb89 Silenced a "classic division" warning in floatformat template filter.
Fixes #16514. Thanks, Mike Blume.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 08:06:52 +00:00
Russell Keith-Magee 3afe409d0e Fixed #14876 -- Ensure that join promotion works correctly when there are nullable related fields. Thanks to simonpercivall for the report, oinopion and Aleksandra Sendecka for the original patch, and to Malcolm for helping me wrestle the edge cases to the ground.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 07:40:12 +00:00
Malcolm Tredinnick 5edf1aabc2 Minor Debian/Ubuntu install instruction update.
This is all a bit of a mess (and fragile and mostly their own fault),
but this at least gives people a clue. Fixes #16287. Patch from
bpeschier.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 07:36:42 +00:00
Malcolm Tredinnick f77666a4af Documented some Oracle-specific test settings.
Patch from aaugustin that should help people with specific testing
requirements for Oracle set things up in their preferred way. The
settings have always existed, but now they are documented.

Fixes #16478.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 06:35:52 +00:00
Malcolm Tredinnick 5994a7442d Trivial documentation typo fix.
Fixed #16545. Thanks, Audrey Roy.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 06:30:42 +00:00
Malcolm Tredinnick 549faf19bf Improved documentation around HTTP server meta variables.
Fixed #16581, with thanks to Bernhard Essl.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 04:27:36 +00:00
Paul McMillan 11cc26681b Added myself to the committers list
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 03:37:37 +00:00