1
0
mirror of https://github.com/django/django.git synced 2024-12-25 18:46:22 +00:00
Commit Graph

5444 Commits

Author SHA1 Message Date
Gary Wilson Jr
2a7f7e1b97 Removed some unused and duplicated imports.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 06:04:09 +00:00
Gary Wilson Jr
c85c8f8891 Fixed #7919 -- md5 and sha modules are deprecated since Python 2.5, use hashlib module when available. Patch from Karen Tracey.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 05:56:57 +00:00
Gary Wilson Jr
8a58f2216c Fixed #8078 -- Fixed a Python 2.3 incompatibility in contrib/admin/options.py, thanks Karen Tracey.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 05:29:17 +00:00
Gary Wilson Jr
351a3ca154 Removed several deprecated features for 1.0 (refs #7830):
* "simple" cache backend
 * `ObjectPaginator`
 * `edit_inline_type` argument for `ForeignKey` fields
 * `QOperator`, `QNot`, `QAnd` and `QOr`
 * `maxlength` argument 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 04:56:11 +00:00
Gary Wilson Jr
cbbd54d5cd Fixed #7920 -- Made tests compatible with Python 2.6's Decimal repr change, patch from Karen Tracey.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8190 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 04:48:14 +00:00
Gary Wilson Jr
a500ade891 Removed two-year-old note about testing framework being under development.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 00:40:05 +00:00
Brian Rosner
d7dc2d3985 Fixed #8086 -- Removed 2.5 specific keyword argument to __import__. Thanks CHasenpflug for noticing this.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 00:33:21 +00:00
Brian Rosner
c4ba628231 Added a missing import from [8186].
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 23:31:20 +00:00
Brian Rosner
e608433ee7 Pass the correct data as the second parameter to find_module to correct admin.autodiscover(). Fixes #7922. Thanks Alex Gaynor for being smarter than me.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 23:29:25 +00:00
Gary Wilson Jr
2db4b13480 Fixed #8070 -- Cache related objects passed to Model init as keyword arguments. Also:
* Model init no longer performs a database query to refetch the related objects it is passed.
 * Model init now caches unsaved related objects correctly, too. (Previously, accessing the field would raise `DoesNotExist` error for `null=False` fields.)
 * Added tests for assigning `None` to `null=True` `ForeignKey` fields (refs #6886).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 23:16:59 +00:00
Brian Rosner
b5c5e8b4c0 Reverted [8182]. Accidently committed from the wrong branch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 22:47:45 +00:00
Brian Rosner
85af264112 Reverted [8174]. It is causing some serious breakage right now. Need to investigate more.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 22:46:15 +00:00
Brian Rosner
9d3c921857 Initial admin template docs. Needs more work.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8182 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 22:46:09 +00:00
Luke Plant
ff486b9fba Fixed #3912 - Added simple type checking to template.Context.update() to help debugging broken context processors. Thanks Jeremy Dunck
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8181 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 21:37:38 +00:00
Luke Plant
8dff194e9b Fixed #3062 - removed arbitrary and unneeded max_length on password fields in auth forms.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8180 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 21:18:17 +00:00
Brian Rosner
af35fb1fbb Ensure that custom primary keys are always shown on a formset. Refs #7938. Thanks magneto for discovering this problem.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8179 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 20:35:40 +00:00
Brian Rosner
61b335700c Fixed #8067 -- Replaced dict literals in the model_formsets tests with sorted lists of tuples to ensure compatibilty on different implementations of Python. Thanks Leo Soto for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 20:12:18 +00:00
Brian Rosner
4c0234215e Fixed #5631 -- When fieldsets contains a field that is on the same line, it is now collapsable when collapse is set in classes. Thanks andybak for some research and Karen Tracey for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 20:00:30 +00:00
Brian Rosner
2904c1d4b3 Clarified the raw_id_fields documentation and added it to InlineModelAdmin options section. Added examples as well. Fixes #7905. Thanks Matthew Flanagan for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8176 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 19:47:26 +00:00
Brian Rosner
e7508a456e Fixed #7983 -- Added fields to the ModelAdmin section in the admin documentation. Thanks julien for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 19:29:37 +00:00
Brian Rosner
525e1e379a Fixed #7922 -- admin.autodiscover() no longer eats ImportErrors for breakfast. Thanks Jan Rademaker and Alex Gaynor for their work on the ticket.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 19:10:55 +00:00
Brian Rosner
be17a801f6 Fixed #7885 -- Prevent duplicates in fields and fieldsets declarations. Thanks julien and wamberg for the patches.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 18:55:43 +00:00
Luke Plant
64f5ab67a5 Changed some URL conf regexes to rawstrings for consistency
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 16:18:24 +00:00
Luke Plant
079e5bf1ec Added a login link to the password reset completion screen.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 16:13:12 +00:00
Luke Plant
27d5972916 Fixed #2175: Added tests for models with multiple GenericForeignKeys
Also fixed small typo in a docstring.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 15:54:53 +00:00
Luke Plant
8fe07d1e63 Fixed #8030 - use super() in BaseModelForm
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 14:44:38 +00:00
Jannis Leidel
c623cc30be Updated German locale
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8168 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 12:31:12 +00:00
James Bennett
74927cd87e Clarify the m2m intermediary docs a bit.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 04:38:55 +00:00
Russell Keith-Magee
c1f5da90a5 Fixed #8059 -- Added additional clarification to the ordering of Memberships so that output order is predictable in tests. Thanks to ramiro for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 02:23:46 +00:00
Russell Keith-Magee
83f0d54d41 Modified inline handling to allow for an inline formset to be displayed when the foreign key exists on a parent class.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8165 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 00:27:40 +00:00
Marc Fargas
b0d1612c9e Closes #8019, Updated Serbian translation; Thanks Nebojsa Djordjevic.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8164 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 21:18:30 +00:00
Marc Fargas
af22db8f08 Closes #7991, Updated Dutch translation; thanks Rudolph Froger
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8163 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 21:12:14 +00:00
Luke Plant
fcd837cd0f Fixed #7723 - implemented a secure password reset form that uses a token and prompts user for new password.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 20:47:53 +00:00
Russell Keith-Magee
9a56fe765e Corrected a typo in [8158]. Thanks to Matthias Kestenholz <mk@spinlock.ch> for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8161 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 13:28:51 +00:00
Russell Keith-Magee
f423dde34a Fixed #7978 -- Modified the contrib.sites tests to guarantee the initial conditions of the test match meet the requirements of the test. Thanks to Evan Schulz for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 09:24:16 +00:00
Russell Keith-Magee
99e34c1846 Fixed #8042 -- Modified the password reset form so that the email field length matches the User model. Thanks to Bob Thomas <bthomas@ncircle.com> for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 09:08:55 +00:00
Russell Keith-Magee
9ea8184da8 Refs #8047 -- Removed some CPython specific parts of the admin scripts tests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8158 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 08:32:19 +00:00
Russell Keith-Magee
7a87f5aeab Fixed #8053 -- Corrected a bug with reset and m2m intermediate tables. Thanks to d00gs for the report and fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8157 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 07:53:55 +00:00
Malcolm Tredinnick
004ff03a8e Removed TEST_COOKIE_NAME and TEST_COOKIE_VALUE constants from
sessions.middleware. They haven't been used here since the great refactor and
are duplicated in sessions.backends.base.SessionBase.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8156 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 21:55:47 +00:00
Russell Keith-Magee
8880fdd9ee Fixed #7935 -- Corrected typo in template docs, plus slightly clarified the language. Thanks to jturnbull for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 12:37:38 +00:00
Russell Keith-Magee
f7d123a731 Fixed #7880 -- Corrected the handling of fields in the admin that specify choices, so that the presence of choices overrides the decision to use a custom admin widget. This is primarily of interest to Date/Time fields. Thanks to camilonova for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 11:41:04 +00:00
Russell Keith-Magee
a98d12b1b2 Fixed #7998 -- Corrected typo. Thanks to ElliotM for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 11:11:44 +00:00
Russell Keith-Magee
56bbe0aa46 Fixed #7990 -- Modified serializers to use StringIO, rather than cStringIO, due to potential unicode issues.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 10:40:37 +00:00
Russell Keith-Magee
4454bde3c1 Fixed #7999 -- Slightly changed the overview example to disambiguate the use of 'article'. Thanks to Kaell <joshalto@hotmail.com> for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 10:08:12 +00:00
Russell Keith-Magee
0dc11a0c1d Fixed #8029 -- Modified admin_scripts test to use the PYTHONPATH from the environment where the test is executed. Thanks to Ramiro and Alex Gaynor for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 09:29:51 +00:00
Malcolm Tredinnick
74dde43989 The help_text attribute in forms can be a ugettext_lazy() object, so be careful
not to trigger translations at import time.

I checked other usages of help_text in form fields and model fields and there
is not similar usage in __init__() methods.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 05:50:24 +00:00
Malcolm Tredinnick
ea45a932d3 A couple of small typo fixes in the settings docs. Fixed #8032.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 03:19:31 +00:00
Malcolm Tredinnick
b7e74e5e56 Fixed #8028 -- A couple of small docstring fixes from [8131]. Thanks, Leo Soto.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8146 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 03:16:39 +00:00
Malcolm Tredinnick
464a9c8ca4 Fixed #7637 -- Added an extra parameterisation hook to the Oracle backend.
Required for some extension modules (in particular, geo-django). Patch from
Justin Bronn.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 01:29:31 +00:00
Malcolm Tredinnick
726a24c609 Fixed #7992 -- Interpolate UTF-8 verbose_names correctly into unicode strings
in the admin interface. Patch from aabele. Refs #8016.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 00:52:01 +00:00