mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
Code Issues 30 Releases Wiki Activity
5,270 Commits 28 Branches 426 Tags 668 MiB
27d5972916
Commit Graph

5270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Malcolm Tredinnick
281f2b74bf Fixed #8023 -- Allow filtering of DecimalFields (in models) using strings. 
At the same time, checked all other cases of db_prep_value() to ensure they
aren't making the same mistake.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8143 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-30 00:18:49 +00:00
Malcolm Tredinnick
1ba2d6888f Since max_digits and decimal_places are required on django.db.models.DecimalField, one of the tests was a bit bogus. Fixed that. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8142 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-30 00:18:31 +00:00
Malcolm Tredinnick
ab07a9b19f Added a clarification to the docs about filtering across nullable intermediate 
models with a NULL entry. I'm not brilliantly happy with the description
(it's too long for such an edge case, for a start), but it gets the intent across. Refs #8025.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 23:09:54 +00:00
Russell Keith-Magee
a14fc40041 Fixed #7913 -- Corrected ham-fisted typo from [8102]. Thanks to evinrik for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 21:43:07 +00:00
Jacob Kaplan-Moss
b69b15fe02 Fixed a subtle bug (really, an inconsistency) in ForeignKey that [8132] exposed by causing the model_forms test to fail. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 18:31:27 +00:00
Russell Keith-Magee
bf777442fa Fixed #7695 -- Modified template to trust help_text on a model field. Thanks to Ben Spaulding for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 13:32:47 +00:00
Russell Keith-Magee
174641b9b3 Fixed #6095 -- Added the ability to specify the model to use to manage a ManyToManyField. Thanks to Eric Florenzano for his excellent work on this patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 12:41:08 +00:00
Malcolm Tredinnick
f752f69238 Fixed #7767 -- Fixed template egg loading test for Windows systems. 
Thanks, Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 06:05:15 +00:00
Malcolm Tredinnick
b6fe483bf5 Fixed #1157 -- Added some text to i18n.txt to explain how to install the 
necessary gettext tools on Windows (relevant to translators only). Thanks,
Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 06:02:47 +00:00
Malcolm Tredinnick
548ac72207 Fixed #7589 -- Added a way for post-table-creation SQL modifications to be done for custom fields (needed by geo-django, but useful in other situations, too). 
Patch from Justin Bronn.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 05:53:44 +00:00
Malcolm Tredinnick
af7773f280 Fixed #8011 -- Be careful not to evalute lazy-translated Meta.verbose_name 
values whilst importing models.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8132 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 05:17:47 +00:00
Malcolm Tredinnick
b3b71a0922 Fixed #7560 -- Moved a lot of the value conversion preparation for 
loading/saving interactions with the databases into django.db.backend. This
helps external db backend writers and removes a bunch of database-specific
if-tests in django.db.models.fields.

Great work from Leo Soto.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-29 05:09:29 +00:00
Gary Wilson Jr
7bc728c826 A few corrections to my docstrings in [8129]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-28 20:35:39 +00:00
Gary Wilson Jr
96cf3656c4 Fixed #6997 -- Corrected num_pages calculation when one item is in the object list and allow_empty_first_page=False, thanks to framos for the report. Also, made Page's start_index() return 0 if there are no items in the object list (previously it was returning 1, but now it is consistent with end_index()). As an added bonus, I threw in quite a few pagination tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-28 05:30:35 +00:00
Malcolm Tredinnick
19c7db0058 Fixed #7853 -- Fixed another case of deleting inherited models with foreign key 
references. Thanks to Russell for the test case that demonstrated the problem.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-28 01:32:46 +00:00
Malcolm Tredinnick
55ba38f9d2 Put back [8120] along with a small tweak. Fixed #6217. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-28 00:45:04 +00:00
Malcolm Tredinnick
eca5aacec8 Back out [8120] for a bit. Refs #6217. It's having unintended side-effects (a.k.a breaks the tree) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8126 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-28 00:08:17 +00:00
James Bennett
4b6766cd6b Remove the last remaining references to manipulators outside of oldforms docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 23:51:07 +00:00
Malcolm Tredinnick
d57ce3d6a9 Fixed #7131 -- Updated included simplejson code to match the simplejson-1.9.2 
release. This should be fully backwards-compatible for people using the public
interfaces.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 23:38:28 +00:00
James Bennett
de9e2ae5bb Removing another mention of manipulators 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8123 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 23:27:16 +00:00
James Bennett
fdff91ac2d Remove a couple mentions of manipulators (which are no longer relevant) from docs/model-api.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 23:23:49 +00:00
Gary Wilson Jr
9a5301ccbc Made the Paginator class a bit more backwards compatible with the lecacy ObjectPaginator class by using the ObjectPaginator's _get_count method. Instead of explicitly checking for an instance of QuerySet, this now allows any object with a count() or __len__() method defined to be passed to Paginator. For one, this is useful when you have custom QuerySet-like classes that implement a count() method but don't inherit from QuerySet explicitly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 23:01:55 +00:00
Malcolm Tredinnick
6a287ed946 Fixed #6217 -- Reduced the memory used by each ugettext_lazy() call. 
Thanks to Jakub Wilk for analysis and the initial patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8120 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 22:51:49 +00:00
Gary Wilson Jr
7d1c147bb4 Fixed #7320 -- For object_list generic view, the page argument can also be the string "last", thanks Ubercore. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 22:09:12 +00:00