p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,946 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

5946 Commits

Author SHA1 Message Date
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
Malcolm Tredinnick f96b1249ce Removed a couple of unused imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:28:31 +00:00
Malcolm Tredinnick 65c0846c45 Updated a few save() methods on models to accept force_insert and force_update 
parameters. Required as a consequence of [8670] (so they can be used with
create()).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:28:17 +00:00
Jacob Kaplan-Moss a46d3ebfcc Fixed #8221: added some better `NoReverseMatch` error strings. Thanks, mrts. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:05:14 +00:00
Malcolm Tredinnick 10244d1c04 Fixed #8645 -- Updated Dutch translation from Rudolph Froger. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 17:26:16 +00:00
Malcolm Tredinnick c181734fa1 Changed create() and get_or_create() to force an insert (not update an existing value). 
Backwards incompatible if you are using manually-specific primary key values
and relying on the previously documented behaviour that the new values would
always exist in the database (i.e. it would update the existing entry).

Fixed #8419.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 17:18:05 +00:00
Jacob Kaplan-Moss 79348d4018 Removed doc references to obsolete removed forms stuff. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 16:33:11 +00:00
Jacob Kaplan-Moss 82179ccbbb Fixed #8637: fixed timeuntil and date values. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 16:31:50 +00:00
Jacob Kaplan-Moss 2e7a87c53c Fixed a typo in comments upgrade guide. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 16:27:19 +00:00
Jacob Kaplan-Moss fc6649092a Fixed an inconsistancy in redirects with `META['SERVER_PORT']` being either a string or an int. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 16:18:32 +00:00
Malcolm Tredinnick fc1fbf614f Removed a comment from the top of the Hungarian translation to avoid any 
potential confusion.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8665 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 16:15:44 +00:00
Jacob Kaplan-Moss 3d577febc7 Fixed #7524: allow errors raised during import of a urlconf to bubble up. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 16:14:13 +00:00
Jacob Kaplan-Moss 1a40498da4 FIxed #8613: removed vestigal `FileField.save_file()`. Thanks, kratorius. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 16:05:09 +00:00
Jacob Kaplan-Moss b31568aed3 Fixed #8027: correctly validate fields/fieldsets in `ModelAdmin` validation when using custom `ModelForm`s. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 15:43:04 +00:00
Jacob Kaplan-Moss b99cc935eb Fixed #7753: clean `NullBooleanField` correctly when using `HiddenInput`. Thanks to julien and ElliottM. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8661 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 15:06:18 +00:00
Marc Fargas 938f7ea913 Updated Macedonian translation, thanks Georgi Stanojevski 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8660 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 13:57:37 +00:00
Russell Keith-Magee f53596d59f Fixed #8407: Corrected some output in the Paginator docs. Thanks to arien for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 13:44:50 +00:00
Russell Keith-Magee 5c43a0a43f Fixed #8406: Corrected some expected output to use repr format. Thanks to arien for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 13:40:20 +00:00