mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-19 07:54:07 +00:00
Code Issues 24 Releases Wiki Activity
5,813 Commits 28 Branches 423 Tags 638 MiB
51836756d0
Commit Graph

5813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Malcolm Tredinnick
51836756d0 Fixed a typo from the refactoring in [8455]. With bonus test, too. Thanks, vung. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 22:29:38 +00:00
Malcolm Tredinnick
38362a1276 Fixed a missing piece of [8721]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 21:48:40 +00:00
Malcolm Tredinnick
f3e088d2d9 Fixed #8697 -- Updated Norwegian translation from Jon Lønne. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 21:41:50 +00:00
Malcolm Tredinnick
f04123f4df Fixed #8279 -- Multiple many-to-many relations to "self" are now possible. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 21:24:00 +00:00
Jacob Kaplan-Moss
ae953a8c4e Fixed #8673: fixed a missing import in django.core.files.move. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 20:00:55 +00:00
Brian Rosner
5c31c68560 Properly reference FieldDoesNotExist as it does not exist in global of django/contrib/admin/options.py. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 19:50:22 +00:00
Jacob Kaplan-Moss
21adbd6738 Fixed #7466: do a better job figuring out links from the admin docs into the rest of the admin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 19:29:16 +00:00
Jacob Kaplan-Moss
0871ff2c9c Fixed #7810: added named URLs for admin docs, and use them in the admin base template. Thanks, MattBowen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 19:28:53 +00:00
Jacob Kaplan-Moss
c068bc184c Merge branch 'url-tag-asvar' 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 19:28:03 +00:00
Jacob Kaplan-Moss
2ca8cf3628 Fixed #8653: make formtools' security hash more rubust. Silly that I didn't think of this before; thanks to bthomas for providing the obvious fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 19:15:34 +00:00
Malcolm Tredinnick
71076ae299 Fixed some edge-case error handling from [8699]. Thanks, gkelly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 18:12:31 +00:00
Malcolm Tredinnick
ef7f61a35e Fixed #8541 -- An attempt at translating the technical messages IDs for zh_CN from garcia_marc. 
This fixes the obvious problem, but a full translation update is needed from a
Chinese speaker here.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 18:09:10 +00:00
Malcolm Tredinnick
f2fd577bd5 Fixed #8689 -- Updated Russian translation from Grigory Fateyev. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8712 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 17:49:22 +00:00
Malcolm Tredinnick
8f0bdb1468 Fixed #8685 -- Updated Portugese translation from Nuno Mariz. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 17:49:05 +00:00
Malcolm Tredinnick
0e9ba0af36 Updated French translation from David Larlet and Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8710 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 17:48:28 +00:00
Brian Rosner
39986669c1 Fixed #8692 -- Added Sebastian Hillig to AUTHORS. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 17:44:05 +00:00
Brian Rosner
d57d490b76 Fixed #7918 -- Allow the foreign key in an inline to be any where in the parent chain. Thanks sil for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 17:41:40 +00:00
Malcolm Tredinnick
3717e3bba3 Reverted #8688 for now, since it merely introduced different bugs, rather than 
fixing the problem. We have a plan B (and plan C, if needed), so this will be
fixed in a different way.

Refs #8616.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 17:32:21 +00:00
Brian Rosner
c113133dad Fixed #7893 -- Gave fieldsets dictionary options a better visual display to set aside from other options in the ModelAdmin due to some name clashing causing confusion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 17:02:06 +00:00
Jacob Kaplan-Moss
6a8dcafb57 Fixed #8278: fixed QueryDict.update(QueryDict). Thanks, julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8705 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:49:19 +00:00
Brian Rosner
cd0b65bcf7 Fixed #7982 -- Corrected ModelAdmin url dispatching to ensure it matching exactly what it needs and doesn't stomp on primary key space. 'add' is a lost cause for now. This originated from #6470. Thanks jdetaeye for the original patch and basith for providing test cases. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:46:46 +00:00
Jacob Kaplan-Moss
ddf7d7ab02 Fixed #8668: prevent MySQL from running the new test from [8676]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:32:44 +00:00
Nicola Larosa
8cfecbd748 Italian translation, again: darned KBabel... 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:31:00 +00:00
Nicola Larosa
d95466b7a0 Italian translation updated (apparently, even string freezes are subject 
to global warming, lately...)


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:28:52 +00:00
Jacob Kaplan-Moss
15416a9016 Fixed #7881: Support __in lookups in limit_choices_to and raw_id_admin. Thanks, jamesturk. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:13:17 +00:00
Jacob Kaplan-Moss
21928f2ba0 Fixed #7738: support initial values via GET for SelectMutliple in the admin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:09:29 +00:00
Brian Rosner
89ccbabbfc When a form in the admin has no fields prevent failure. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:07:19 +00:00
Jacob Kaplan-Moss
b5da9e8b2d Fixed #8687, a bad variable name in validation. Thanks, vung. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 15:45:23 +00:00
Jarek Zgoda
7f055554e0 Fixed #8665 - Polish translations update. Thanks, Piotr Lewandowski. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 06:53:02 +00:00
Malcolm Tredinnick
6ebbf7ac96 Fixed #8638 -- Show by example that the File.name attribute includes the upload 
directory as well as the filename. Patch from Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 05:15:49 +00:00
Malcolm Tredinnick
2dba41056f Revived a bunch of missing documentation that got lost in the docs-refactor. 
This describes values_list(), the new cross-model order_by() syntax and the
effects of distinct(), values() and order_by() on each other.

Fixed #8634.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 05:04:26 +00:00
Malcolm Tredinnick
e66b0ae576 Updated Japanese translation from Takashi Matsuo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 04:30:19 +00:00
Malcolm Tredinnick
90279aeaf0 Fixed #8575 -- Catch one particular instance of OperationalError in MySQL and 
convert it to an IntegrityError, which seems like the more natural case (and is
consistent with other backends). This makes exception handling in Django much
easier.

The solution is extensible for any other error codes we may wish to add going
forwards.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 04:30:07 +00:00
Malcolm Tredinnick
54f41e3507 Fixed #8101 -- Allow the strings '1' and '0' as filter values for boolean 
fields (the latter was causing problems). This allows these values in URLs
(e.g. the admin filtering).

Not an ideal solution to the problem, but will do the job for the time being.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8691 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 02:40:56 +00:00
Malcolm Tredinnick
a1d2f6ef0c Fixed #7823 -- Fixed an edge case in RelatedField.get_db_prep_lookup() so that 
it works correctly with custom field subclasses. Patch from Ivan Sagalaev.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 02:40:50 +00:00
Malcolm Tredinnick
d22ee35ee9 Fixed #8662 -- Fixed the documentation of Model.save() to match the real 
signature so that people overriding it will use the right signature.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 01:44:15 +00:00
Malcolm Tredinnick
02f86a1c7c Fixed #8616 -- Fixed a race condition in the file-based session backend. 
Thanks to warren@wandrsmith.net for the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 01:44:11 +00:00
Marc Fargas
6e841ca767 Updated catalan translation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8687 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 22:59:23 +00:00
Marc Fargas
e3b178ede3 Updated Spanish translation. 
The Last-Translator and Language-Team fields have been shortened to avoid
further wrapping by gettext.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 22:58:19 +00:00
Jacob Kaplan-Moss
52914fbf5a Fixed #8656: added a note about iterating over UploadedFile only understanding \n. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 21:39:17 +00:00
Jacob Kaplan-Moss
fc2978cc45 Fixed a bug in NullBooleanField.to_python. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 21:23:21 +00:00
Jannis Leidel
8d8236385f Updated German translation, yay. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 21:02:05 +00:00
Jacob Kaplan-Moss
a41ca9c9e2 Fixed #8556: added a useful formfield to CommaSeparatedIntegerField. gkelly, mattmcc, and kratorius all contributed portions of this patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 20:58:10 +00:00
Jacob Kaplan-Moss
fe8e00ae06 Fixed #8194: AdminForm.first_field now correctly returns the first field when using custom field orders. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 20:48:59 +00:00
Jacob Kaplan-Moss
503fda43fa Fixed #8654: added ugettext_lazy to django.utils.translation.__all__. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 20:20:40 +00:00
Jacob Kaplan-Moss
0c66bac4f3 Marked a handful of missed strings for translation. Fixes #8644, #8617, and #8610. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 20:17:31 +00:00
Ludvig Ericson
9348c118da Updated all Swedish translations. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:54:43 +00:00
Jacob Kaplan-Moss
7b65302567 Fixed #8608: corrected doc link in comment 400 error page. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:46:33 +00:00
Jacob Kaplan-Moss
9f59fc5560 Fixed #8651: correctly deserialize objects with 0 for pk/fk. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:38:56 +00:00
Malcolm Tredinnick
195420259a Fixed #8403 -- Changed the use of fcntl.flock() to fcntl.lockf(). On some 
systems, this will ensure fnctl-based file locking is always used, which means
locking of NFS-mounted files should work.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:28:45 +00:00