mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-26 19:16:11 +00:00
Code Issues 27 Releases Wiki Activity
5,183 Commits 28 Branches 426 Tags 667 MiB
4ec2b8904b
Commit Graph

834 Commits

Author SHA1 Message Date
Jacob Kaplan-Moss
7b3cf13d32 Improved admin model registration options: you can now register using register(Model, **options) and even register(Model, ModelAdmin, **options). This isn't documented yet -- a much expanded version of docs/admin.txt is on the way. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-23 18:58:06 +00:00
Malcolm Tredinnick
a7b556ca04 Allow for matches against unsaved objects in querysets (which will therefore 
match nothing). This allows for some more straightforward code in the admin
interface.

Fixed #7488 (all the debugging there was done by Brian Rosner, who narrowed it
down to the item in this patch).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-23 06:12:15 +00:00
Brian Rosner
3912403550 Added the ability to customize the prefix value on an inline formset. Fixes #7899. AThanks for the tip Peter of the Norse. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-23 04:46:31 +00:00
Malcolm Tredinnick
681e7bbd25 Removed some potentially misleading code (it isn't executed) after the changes 
in [8055]. Thanks, Karen. Refs #7745.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8059 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-23 04:41:53 +00:00
Brian Rosner
9d8f41baac Made the semi-private _max_form_count live on the public API of formsets by renaming it to max_num. This also removes the ManagementForm use of MAX_COUNT since that usage should just be referenced to the formset's max_num property. Refs #7899. Thanks Peter of the Norse for straightening me out. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-23 04:28:52 +00:00
Russell Keith-Magee
437945146d Fixed #7906 -- Modified admin_scripts regression test to use the same python executable that is running the test suite, rather than using 'python' on the path. Thanks to Chris Hasenpflug for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8056 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-23 03:00:50 +00:00
Malcolm Tredinnick
c5a76a3669 Fixed a bunch of Python 2.3 test failures. 
All remaining buildbot failures on 2.3 are not due to the test suite, as far as
I can work out.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 19:48:36 +00:00
Malcolm Tredinnick
d1ea8b2842 Changed the test from [8052] so that it is insensitive to whether a database 
sorts NULLs first or last in a sequence or results.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8054 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 18:56:50 +00:00
Malcolm Tredinnick
8745beccb1 Fixed #7813 -- Allow pickling of Query classes that use select_related(). 
Based on a patch from Justin Bronn.

The test in this patch most likely breaks on Oracle. That's another issue.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 08:23:20 +00:00
Malcolm Tredinnick
83e97ecf88 Fixed #7791 -- Fixed a really silly error I introduced in [7926]. :-( 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 07:37:09 +00:00
Malcolm Tredinnick
0e9587fd6b Fixed the tests from [8033] to work for the PostgreSQL backends (the primary 
key value isn't guaranteed to be the same across all backends). Still some
breakage on MySQL because of the way it treats booleans, but that's another
issue.

Refs #6755.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8051 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 05:15:40 +00:00
Adrian Holovaty
8bc442e771 Fixed #7304 -- Gave AnonymousUser a has_perms() method, which it was lacking 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 03:05:40 +00:00
Jacob Kaplan-Moss
863f4eb1d7 Fixed #6755: model inheritance now works in the admin. Thanks, sloonz and Michael Placentra. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 01:10:06 +00:00
Luke Plant
384a721e1c Fixed #7825 - modeltests/delete tests failing after NFA merge, and improved documentation of these tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8030 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-21 17:28:21 +00:00
Jacob Kaplan-Moss
970611827b FIxed #7666: use a bare queryset when accessing single related objects so that the related objects never become inaccessible. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-21 15:41:21 +00:00
Russell Keith-Magee
4016d5264a Fixed #7727 -- Improved the checks for import failure when using PIL. Under PyPy, you can import the PIL module, but when you try to use it, the underlying _imaging module will not be available. Thanks to Maciej Fijalkowski (fijal) for the report and suggested fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-21 11:52:11 +00:00
Malcolm Tredinnick
bfcecbffd3 Changed/fixed the way Django handles SCRIPT_NAME and PATH_INFO (or 
equivalents). Basically, URL resolving will only use the PATH_INFO and the
SCRIPT_NAME will be prepended by reverse() automatically. Allows for more
portable development and installation. Also exposes SCRIPT_NAME in the
HttpRequest instance.

There are a number of cases where things don't work completely transparently,
so mod_python and fastcgi users should read the relevant docs.

Fixed #285, #1516, #3414.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-21 07:57:10 +00:00
Gary Wilson Jr
80ac41e2f7 Corrected typo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-21 03:50:40 +00:00
Russell Keith-Magee
d911a64ce8 Fixed #6450 -- Improved the checking of errors when creating the directories for saved files. Thanks to henry@precheur.org for the report and patch, and vung for the excellent test case. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-20 12:44:41 +00:00
Russell Keith-Magee
6db9fd0116 Made the test case for doctest comparison of XML fragments a little more rigorous. Refs #7441. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-20 08:47:10 +00:00
Russell Keith-Magee
b58de15139 Fixed #7339 -- Added manual calls to the garbage collector. This is required for PyPy and Jython; these implementations don't use reference counting, so you can't rely on __del__ being run immediately after del is called. Thanks to Maciej Fijalkowski (fijal) and Leo Soto. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8004 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-20 06:32:54 +00:00
Russell Keith-Magee
2f49d18071 Fixed #7441 -- Removed some of the shortcuts in the doctest output comparators, and added a wrapper to allow comparison of xml fragments. Thanks to Leo Soto for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-20 05:46:41 +00:00
Malcolm Tredinnick
5141b67a19 Reverted [7986]. 
It turns out that we need to treat filename creation/display (in
particular, the upload_to path) differently depending upon whether the value is
out of the database or provided by other code and there's no reliable way to
determine that at the moment (although some later proposed changes might alter
that). So calling get_FIELD_filename on an unsaved model with a changed file
attribute will not necessarily return the same result as after the save().

Refs #5619. Fixed #7843.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 22:26:32 +00:00
Malcolm Tredinnick
8ac9cbee2f Fixed #7763 -- Added a Romanian localflavor. Thanks, MihaiD. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 19:22:44 +00:00
Malcolm Tredinnick
344383284c Fixed #6009 -- Added regression tests to show that uploading non-ASCII 
filenames now works properly. Patch from Leah Culver.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 18:47:59 +00:00
Malcolm Tredinnick
a103786971 Fixed #5619 -- Return the same path in get_FOO_filename() before and after a 
model is saved (i.e. make sure the upload prefix is prepended in both cases).

Patch from wreese@gmail.com. Tests from Leah Culver.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 18:35:11 +00:00
Russell Keith-Magee
0cffff024b Fixed #7441 - Improved the doctest OutputChecker to be more lenient with JSON an XML outputs. This is required so that output ordering that doesn't matter at a semantic level (such as the order of keys in a JSON dictionary, or attributes in an XML element) isn't caught as a test failure. Thanks to Leo Soto for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 14:46:55 +00:00
Russell Keith-Magee
649463dd34 Fixed #4412 -- Added support for optgroups, both in the model when defining choices, and in the form field and widgets when the optgroups are displayed. Thanks to Matt McClanahan <cardinal@dodds.net>, Tai Lee <real.human@mrmachine.net> and SmileyChris for their contributions at various stages in the life of this ticket. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 07:53:02 +00:00
Russell Keith-Magee
825622d912 Fixed #7773 -- Added some simple tests for EmailMessage. Thanks to serialx for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7975 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 02:38:41 +00:00
Jacob Kaplan-Moss
46786b4193 Fixed #7741: django.newforms is now django.forms. This is obviously a backwards-incompatible change. There's a warning upon import of django.newforms itself, but deeper imports will raise errors. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-19 01:22:26 +00:00
Brian Rosner
a19ed8aea3 Merged the newforms-admin branch into trunk. 
This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets
and Media definitions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 23:54:34 +00:00
Jacob Kaplan-Moss
7997133a3d Fixed #3639: updated generic create_update views to use newforms. This is a backwards-incompatible change. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 19:45:00 +00:00
Jacob Kaplan-Moss
cd80ce7a3d Added missing files form [7946] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 17:39:31 +00:00
Malcolm Tredinnick
c681f4070c Removed the mysql_old backend. It smells bad and has no friends. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 17:38:53 +00:00
Adrian Holovaty
df2b19cc17 Fixed #1443 -- Django's various bits now support dates before 1900. Thanks to SmileyChris, Chris Green, Fredrik Lundh and others for patches and design help 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 03:47:27 +00:00
Russell Keith-Magee
c4d0cfe1ee Refs #7745 -- Modified use of assertTrue to failUnless, because assertTrue isn't available in Python 2.3. Thanks to Karen Tracey for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-17 13:29:35 +00:00
Malcolm Tredinnick
431206a252 Fixed #7786 -- Removed some tests from running when using Python 2.3. 
The problem being "hidden" here is not serious. It won't affect correct code
and only gives a different failure mode for incorrect code. The moral is: don't
write incorrect code.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-16 23:55:10 +00:00
Malcolm Tredinnick
52fdedba48 Fixed #7759 -- Fixed QuerySet.count() when the results cache was only partially 
populated.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-16 23:17:29 +00:00
Malcolm Tredinnick
3b37c8151a Fixed #7411 -- worked around some possible transaction conflicts in SQLite. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-15 18:47:32 +00:00
Russell Keith-Magee
e867c5a0cc Removed a Python2.3 incompatible generator construct. Thanks to Karen Tracey for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-14 04:57:01 +00:00
Russell Keith-Magee
be6ca58d43 Fixed #7728 -- Modified the output check in the admin script tests. Checking for pyc is a CPython-specific check, and it breaks CPython if pyc files aren't generated (due to permission problems, etc). Thanks to Maciej Fijalkowski (fijal) for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-13 08:57:30 +00:00
Russell Keith-Magee
32b8c3e1c0 Fixed #7718 -- Added a naive implementation of sorted() for Python 2.3 compatibility, and modified test cases to import the function when required. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-13 08:48:18 +00:00
Jacob Kaplan-Moss
185ba8f7e4 FIxed #7696: fixed model_form tests on Windows after [7814]. Thanks, Marty Alchin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7909 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-12 20:44:05 +00:00
Jacob Kaplan-Moss
8e852a92ec Fixed #7613: fixed file_upload tests when LANG=C. Thanks, eddymul. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-12 20:43:03 +00:00
Russell Keith-Magee
4aa6c57251 Fixed #7583 -- Corrected the testing docs that referred to the defunct headers attribute of the response. Added a test case to validate (and document) the new behavior. Thanks to Malcolm for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7900 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-12 06:16:42 +00:00
Russell Keith-Magee
e31945a2ad Fixed #7303 -- Clarified a test case that was dependent on dict ordering. Thanks to leosoto for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-11 14:29:47 +00:00
Russell Keith-Magee
8e0b6bdcd5 Fixed #6017 -- Modified the Lax parser to allow --settings and the other core management arguments to appear anywhere in the argument list. Thanks to Todd O'Bryan for the suggestion and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-11 13:18:19 +00:00
Russell Keith-Magee
4516233f9e Fixed #7715 -- Modified the admin_scripts tests to do an app level import, rather than a project level import. This removes the potential for conflict between the admin script tests and the settings for the test suite itself. Thanks to Malcolm Tredinnick for his help hunting this one down. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-11 13:04:17 +00:00
Malcolm Tredinnick
2b193f6100 Fixed #7698 -- Handle '0' correctly when used as the upper bound of a slice. 
Based on a patch from enoksrd.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-11 12:43:27 +00:00
Malcolm Tredinnick
7936c0b917 Fixed #7448 -- Convert "in" filters to pass in the correct values for datetimes 
and similar complex objects.

Based on patches from cgrady and alexkosholev. Refs #7707.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-11 09:00:35 +00:00