mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-28 20:16:19 +00:00
Code Issues 30 Releases Wiki Activity
9,407 Commits 28 Branches 426 Tags 680 MiB
575962c213
Commit Graph

9407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Keith-Magee
591ad8afbf Fixed #14512 -- Added documentation on how to apply decorators to class-based generic views. Thanks to Łukasz Rekucki for his work on the issue. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-20 05:10:13 +00:00
Luke Plant
ec7c49f253 Fixed hyperlinking of template tags for Sphinx >= 1.0 
Follow on from incomplete fix in [14477], and [14631] which removed
compatibility for Sphinx < 1.0

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-20 01:37:54 +00:00
Ian Kelly
58eca97e71 Updated an old workaround described in the Oracle backend notes with more modern advice. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-20 01:11:34 +00:00
Carl Meyer
61a89f8e1b Fixed poorly-constructed test from r14612. Thanks to Alex Gaynor for the eagle eyes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-20 00:05:11 +00:00
Ramiro Morales
f609306349 Removed compatibility with Sphinx < 1.0 workarounds in our extension code. Also, started to use the 'needs_sphinx' Sphinx config var. 
Follow up on r14624.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 23:19:56 +00:00
Ian Kelly
c0adc62fcc Fixed #13351: Added documentation about the cx_Oracle 'threaded' option to the oracle backend notes. 
Thanks to Skaffen for the suggestion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 23:19:23 +00:00
Ramiro Morales
0e26f58dae Corrected change in behavior regarding the page shown after the 'Save' button is pressed when adding a user through the admin. 
It had been introduced in trunk (r13503) and between 1.2.1 and 1.2.2 (r13504). The original fix intended to correct a similar problem introduced between 1.1 and 1.2 (r12218) this time in the 'Save and add another' button.
We have now tests for the three buttons present in the Add User admin form to avoid future regressions.
Thanks to Juan Pedro Fisanotti and Cesar H. Roldan for their work.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 22:45:51 +00:00
Alex Gaynor
a3e7ee7c40 Began converting localflavor doctests into unittests, starting with the German ones. Also introduced a new base class to facilitate ease of testing form fields. We have always been at war with doctests. Thanks to Idan Gazit for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 19:33:07 +00:00
Carl Meyer
59c84b4391 Bumped documentation-building requirements to Sphinx 1.0.2 and Pygments 1.1. The use of 'console' highlight in staticfiles docs requires Pygments 1.1. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14624 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 16:10:23 +00:00
Russell Keith-Magee
99d247f4cb Fixed #13795 -- Added a site-wide cache prefix and cache versioning. Thanks to bruth for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 15:39:35 +00:00
Carl Meyer
261aee26c1 Fixed #14728 -- Broadened warning about django-admin.py missing .py suffix to include more than just Ubuntu, since at least Fedora also does this. Thanks to giallu for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 14:26:01 +00:00
Alex Gaynor
49d831380f Corrected the way databases were compared. This allows running the test suite with two in memory SQLite databases. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 08:08:08 +00:00
Alex Gaynor
f777ddf3e6 Fixed a failing test caused by [14614]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 03:42:20 +00:00
Alex Gaynor
3ede430b9a Converted the model_regress doctests into unittests. We have always been at war with doctests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-18 23:32:01 +00:00
Carl Meyer
008f333bac Fixed pk uniqueness validation for new objects created outside of a ModelForm. Also removed need for ModelForm to poke at Model._state.adding, keeping it an internal ORM concern. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-18 23:29:58 +00:00
Carl Meyer
38ba3775ec Fixed #14234 -- Re-validating a model instance added via ModelForm no longer throws spurious PK uniqueness errors. Thanks to David Reynolds and Jeremy Dunck. 
Also moved Model._adding to Model._state.adding to reduce instance namespace footprint.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-18 22:43:46 +00:00
Luke Plant
9cebb526f2 Fixed incorrect path to MultipleObjectMixin in docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-18 01:53:38 +00:00
Luke Plant
a205fe9378 Added notes in old generic views howto about the new class based approach. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-18 01:29:41 +00:00
Luke Plant
9712f4c7a4 Corrected link in release notes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-18 01:29:25 +00:00
Jannis Leidel
9b6535b894 Fixed #7077 and #7431 -- Use getpass.getuser instead of pwd.getpwuid to determine the current system user's username in the createsuperuser management command to enable the feature on Windows. getpass.getuser automatically falls back to the previous method. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 20:28:33 +00:00
Alex Gaynor
0aeb6c964a Added a hidden toctree pointing at the index file in the docs to silence a sphinx warning. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 20:26:20 +00:00
Alex Gaynor
204253ed40 Fixed #14713 -- documented that resolve can raise Http404. Thanks to Adam for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 20:03:15 +00:00
Alex Gaynor
fc47f8c65a Fixed #14257 -- removed ManyToManyField.isValidIDList which was completely dead code (unused since magic-removal). Thanks to andrewsk for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 17:00:40 +00:00
Alex Gaynor
0eb31d3dc9 Fixed #14423 -- corrected incorrect SQL being generated when a nullable, inherited field was used in an exclude. Thanks to PhiR_42 for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 16:46:50 +00:00
Alex Gaynor
c0248f6f07 Corrected some syntax issues in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 16:08:28 +00:00
Jannis Leidel
8a7a8f465b Removed stale directory not removed by git-svn in r14592. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:46:11 +00:00
Jannis Leidel
17b329ae08 Fixed #10004 and #12320 -- Enabled the makemessages management command to collect comments for translators that start with the "Translators" keyword. Thanks for the report and patches, martinb and Claude Paroz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:37:33 +00:00
Jannis Leidel
d7ad02ff72 Fixed a bunch of code examples in the form media documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:36:58 +00:00
Jannis Leidel
96af304747 Fixed #10636 -- Added check to make sure the ADMIN_MEDIA_PREFIX setting is properly set before serving files with the AdminMediaHandler. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14593 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:36:42 +00:00
Jannis Leidel
33d8fcde8a Fixed #14693, #14709 -- Backwards incompatible change to rectify the confusion around the STATICFILES_URL and STATICFILES_ROOT settings. 
* Two new global settings that will be used by -- **but are not limited to** -- the staticfiles app: STATIC_ROOT and STATIC_URL.

  * Moving the 'django.contrib.staticfiles.templatetags.staticfiles' template tag to the core ('django.templatetags.static') and renaming it to 'get_static_prefix'.

  * Moving the context processor 'django.contrib.staticfiles.context_processors.staticfiles' to the core ('django.core.context_processors.static') and renaming it to 'static'.

  * Paths in media definitions will use STATIC_URL as the prefix if the value is not None, and falls back to the previously used MEDIA_URL.

Thanks again to the community for constructive criticism and Carl and Russ for sanity-inducing discussions on IRC.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14592 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 15:36:26 +00:00
Russell Keith-Magee
9b45f6cd54 Migrated model_formsets doctests. Thanks to Gregor Müllegger for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 13:30:44 +00:00
Ramiro Morales
5666bca678 Fixed #11369 -- Corrected verbose_name_plural model Meta option to be consistent with verbose_name when using abstract model inheritance. Thanks Beetle_B for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 12:09:21 +00:00
Alex Gaynor
4276b5197b Fixed #12687 -- fixed an issue with aggregates and counts in conjunction with annotations where the QuerySet was provably empty. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 02:57:14 +00:00
Chris Beaven
3e9d2f81c5 Remove an obsolete admonition in tutorial one (referencing 0.96 functionality) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 02:25:20 +00:00
Alex Gaynor
5b4c6fd5e4 Fixed #14706 -- corrected a stray backtick in the docs. Thanks to Adam for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-17 01:57:23 +00:00
Adrian Holovaty
5844cdca38 Small grammar fix in 'user-uploaded files' comment from [14560] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 23:48:08 +00:00
Ramiro Morales
f3d0704783 Fixed #14691 -- Made ForeignKey.validate() use the right database. Thanks Marco Paolini for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 22:09:13 +00:00
Chris Beaven
ea145923fc Better cross-referencing of the USE_THOUSAND_SEPARATOR setting in documentation. Thanks to Klaas van Schelven for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14578 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 21:33:48 +00:00
Russell Keith-Magee
35dc7d6033 Migrated model_inheritance_regress doctests. Thanks to Gregor Müllegger for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14576 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 15:14:04 +00:00
Luke Plant
b84838aef4 Fixed #14576 - FormWizard.done() method doesn't get passed the last form in the list 
Thanks to cyberdelia for report and test, and steph for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14574 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 14:37:00 +00:00
Luke Plant
b9e6db4ae8 Added info about using logging to the 'Error reporting' howto. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14573 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 14:00:38 +00:00
Luke Plant
165f13dc88 Corrected 'email' to 'e-mail' in error reporting docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14571 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 13:30:31 +00:00
Russell Keith-Magee
8bafde1229 Migrated forms (minus localflavor) doctests. A huge thanks to Daniel Lindsley for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14570 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 13:20:56 +00:00
Alex Gaynor
8da8d6c586 Added a test for using an __in lookup with a ValueListQueryset from a none() call. Refs #14622. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 02:33:51 +00:00
Alex Gaynor
e69bc74351 Fixed #14696, corrected some messed up syntax in the docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14566 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 02:21:07 +00:00
Luke Plant
f6363bc628 Fixed potential circular import problem. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-14 23:35:16 +00:00
Ramiro Morales
b6ec268e23 Fiexed #3055 -- Validate that models target of a GenericRelation have a GenericForeignKey field. 
Thanks jason for diagnosing the problem and Marcos Moyano for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-14 23:21:39 +00:00
Luke Plant
0324151bec Fixed #14685 - incompatible code in contrib.sessions.models 
Thanks to PaulM for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-14 22:23:46 +00:00
Ramiro Morales
74f46c0ae2 Fixed #10650 -- Clarified description of MEDIA_ROOT in setting files. Thanks jjconti, tvon, vak, Muhammad Alkarouri and thiggins for their work. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-14 15:42:54 +00:00
Ramiro Morales
2b344d2628 Fixed #14536 -- Corrected DB connection OPTIONS examples in documentation. Thanks denilsonsa for reporting the error. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14559 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-14 14:15:58 +00:00