mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-20 00:14:08 +00:00
Code Issues 24 Releases Wiki Activity
5,689 Commits 28 Branches 423 Tags 638 MiB
8f5234d801
Commit Graph

5689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jarek Zgoda
7b89abaf48 Missing compiled messages file from previous commit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 20:03:35 +00:00
Jarek Zgoda
03ef8ac114 Updated Polish translation (Austrian localflavor) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 20:02:20 +00:00
Ludvig Ericson
dc7581da2a Updated Swedish translations. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 19:41:22 +00:00
Ludvig Ericson
b790f34542 Updated Swedish translations. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8115 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 19:38:35 +00:00
Gary Wilson Jr
66d5018dd1 Corrected wording in comment. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 19:05:54 +00:00
Malcolm Tredinnick
82a85fdbae Fixed #6427 -- Added some more features to the Austrian localflavor. 
Thanks, Horst Gutmann.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 18:54:56 +00:00
Malcolm Tredinnick
2c6d1e8ebc Fixed #7886 -- Reordered some code in Query.results_iter() to ensure that all 
the prequisites are correctly initialised prior to using them. Only affects
Oracle and other db backends requiring resolve_columns() (e.g. MS SQL?)


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8112 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 18:38:56 +00:00
Gary Wilson Jr
156b21a339 Removed trailing whitespace in admin docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8111 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 18:36:08 +00:00
Gary Wilson Jr
b1c0dc5a01 Normalized the use of "JavaScript" in the documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8110 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 18:34:21 +00:00
Gary Wilson Jr
633ed5c4c9 Fixed #7986 -- Added to the documentation the purpose of the prepopulated_fields ModelAdmin option now that its no longer just a parameter for SlugField fields, thanks frasern. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8109 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 18:27:56 +00:00
Malcolm Tredinnick
ce15b389c1 Fixed the admin_scripts tests to check for the right output with Python 2.4. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8108 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 18:25:06 +00:00
Malcolm Tredinnick
4fee39c63c Fixed #7872 -- Fixed a missed case of promoting table joins when using 
disjunctive filters. Thanks to Michael Radziej for the failing test case.
problem.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 18:16:17 +00:00
Gary Wilson Jr
4774c8d673 Corrected spacing in warning message. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8106 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 17:25:37 +00:00
Gary Wilson Jr
020f965087 Fixed #7988 -- Corrected import of the warnings module, thanks richardh. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 17:24:35 +00:00
Russell Keith-Magee
12eba9efc1 Removed some model saves from [8102] which were causing test failures under Postgres. Thanks to Ramiro Morales for the report (via IRC). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 13:55:35 +00:00
Russell Keith-Magee
830b750131 Added missing svn:ignore property. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 07:24:14 +00:00
Russell Keith-Magee
661f62be3c Fixed #7913 -- Corrected backwards incompatible parts of [7977] when optgroup handling was added to field choices (Ticket #4412). Thanks to Michael Elsdorfer (miracle2k) for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 07:22:39 +00:00
Russell Keith-Magee
0e629b01c0 Added missing svn:ignore property. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 07:01:28 +00:00
Malcolm Tredinnick
3cbe73692e Fixed #7778 -- Fixed a tricky case of foreign key clearing with inherited 
models. Patch from James Murty.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 04:18:52 +00:00
Malcolm Tredinnick
ccab4b041b Fixed #7981 -- Wrap the manual transaction management in the 
serializers_regress tests in some "try...finally" blocks. Patch from Leo Soto.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 03:32:44 +00:00
Malcolm Tredinnick
f48855178d Fixed #7530, #7716 -- When using select_related() and encountering a NULL 
related object, populate the attribute correctly. Patch from Bastien Kleineidam.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 01:18:23 +00:00
Malcolm Tredinnick
aee55ce524 Changed one of the model_formsets tests to be immune to the differences in the 
natural collation ordering used by different databases (normally, this test
would fail on PostgreSQL, but not because the code was incorrect). This is
purely a test tweak.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-27 01:18:18 +00:00
Malcolm Tredinnick
103d484807 Fixed #7658 -- Added some Windows-specific tempfile handling. The standard 
stuff doesn't work with the way Django's file uploading code wants to operate.
Patch from Mike Axiak.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8096 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 22:48:51 +00:00
Malcolm Tredinnick
e29aece743 Fixed #4534 -- Added an "else" option to the "ifchanged" template tag. 
Patch from SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8095 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 22:09:43 +00:00
Malcolm Tredinnick
f763ff4d02 Fixed #7809 -- A few small updates to the French translation. Thanks, cbay. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 22:02:07 +00:00
Malcolm Tredinnick
03373f1e24 Fixed #7345 -- In [8089], I'd forgotten that urlparse.urlsplit() didn't return 
something with attributes until Python 2.5. Thanks, Honza Kral and apollo13.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8093 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 17:08:53 +00:00
Russell Keith-Magee
8099bc536b Fixed #7963 -- Corrected reference to deprecated properties in UploadedFile documentation. Thanks to Marty Alchin for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8092 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 15:06:42 +00:00
Russell Keith-Magee
eca3c7d3d6 Added an ordering definition to make test output reliable across database backends. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 14:49:39 +00:00
Malcolm Tredinnick
66612ef529 Fixed #6413 -- Fixed a deadlock situation in the locmem culling implementation. 
Thanks, Joe Holloway.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8090 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 05:27:59 +00:00
Malcolm Tredinnick
108b604b51 Fixed #7345 -- When normalising the URLField form field, attach a trailing 
slash when only a host (no path) is given. Thanks, jpwatts.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8089 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 05:18:39 +00:00
Malcolm Tredinnick
badde8a7e5 Fixed #7793 -- Handle sitemaps with more than 50,000 URLs in them (by using 
pagination). Patch from Julian Bez.

The docs patch here could probably do with some rewording.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-26 05:07:16 +00:00