mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity
18,001 Commits 30 Branches 460 Tags
df09d854828bcff56eb72f48ff1ba8fce7e90c90
Commit Graph

5547 Commits

Author SHA1 Message Date
Malcolm Tredinnick
7bc5db3a88 Changed the tests added in r8898 very slightly so that they don't return 
unintended results. Doctests aren't self-contained yet when run as part of
the full suite. Refs #5624, #8835.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 17:59:09 +00:00
Malcolm Tredinnick
780f239fa7 Fixed #8825 -- Fixed a small error model field setup (on the model class) from 
r8855. Patch from Christofer Bernander. Test based on one from cgrady.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 05:53:50 +00:00
Malcolm Tredinnick
61cc4a1eee Fixed #8819 -- Don't include two copies of extra-select columns in the query. 
This was triggered by r8794, but was, in fact, fairly fragile before then. The
current fix is the correct way we should be doing this.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 03:48:25 +00:00
Malcolm Tredinnick
85ebb91846 Fixed #8669 -- Use a consistent version of create() across the board for 
model/field instance creation. Based on a patch from Richard Davies.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8884 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 00:09:33 +00:00
Jacob Kaplan-Moss
0e5faf225c Security fix. Announcement forthcoming. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 21:10:00 +00:00
Brian Rosner
c1de41f4d2 Fixed #7973 -- Added exclude to BaseModelAdmin to make everything consistent with the form/formset factories. Refs #8071 to make it easier to get at exclude. Thanks julien for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 17:26:24 +00:00
Jacob Kaplan-Moss
79d2ee3b6d Fixed #8309: subclasses now inherit GenericForeignKey correctly. There's also now an internal API so that other "virtual fields" like GFK can be inherited as well. Thanks, msaelices. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 15:26:00 +00:00
Jacob Kaplan-Moss
98e1cc92f4 Fixed #8795: unique_together validation no longer fails on model forms that exclude fields included in the check. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 14:20:11 +00:00
Malcolm Tredinnick
f31425e8e2 Fixed #7154 -- Inherit all model managers from abstract base classes. 
Also added documentation describing how manager inheritance works (and when
manager aren't inherited). Based on some patches from sebastian_noack and
emulbreh.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 09:04:54 +00:00
Brian Rosner
0cd5caa6a8 Fixed #8787 -- Fixed failing admin_widgets tests. This fixes ManyToManyRawIdWidget which was broken with [8823]. Thanks Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 06:10:14 +00:00
Malcolm Tredinnick
c435975cc7 Fixed #8196 -- Make the model_form tests also pass if you don't have PIL 
installed. We weren't relying on PIL previously, but the output was different
if it wasn't installed, which was triggering spurious failures. Patch from
Marty Alchin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 03:07:26 +00:00
Malcolm Tredinnick
12f6259903 Fixed #8439 -- Complex combinations of Q-objects (using both conjunctions and 
disjunctions) were producing incorrect SQL when nullable relations were
involved. This fixes that.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 02:16:41 +00:00
Malcolm Tredinnick
a9465a75de Fixed a case of incorrect parsing of quanitifers in reg-exp patterns. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 23:03:03 +00:00
Brian Rosner
ce47d4ab83 Fixed #8648 -- Admin no longer ignores to_field. Thanks for the help Karen Tracey and SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 22:43:38 +00:00
Jacob Kaplan-Moss
fc4948d574 Fixed #8770: made some tests more robust under MySQL. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8821 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 22:28:18 +00:00
Jacob Kaplan-Moss
3a18002bbd Fixed #8210 and #8664: moved USStateField and PhoneNumberField to django.contrib.localflavor.us. This is a backwards-incompatible change, albeit a minor one; just add an aditional import and go on your way. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 22:15:35 +00:00
Brian Rosner
7c7ad041b3 Fixed #7975 -- Callable defaults in inline model formsets now work correctly. Based on patch from msaelices. Thanks for your hard work msaelices. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 21:28:32 +00:00
Jacob Kaplan-Moss
ca7db155aa Fixed #8763: added an explicit ordering to the generic_relations test so that the test results aren't dependant on database ordering. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 21:16:17 +00:00
Jacob Kaplan-Moss
d5cc16b471 Fixed #8076: fixed get_(next/previous)_by_date when used with subclasses. Thanks, bjornkri and jan_oberst. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 21:04:01 +00:00
Jacob Kaplan-Moss
d7e9bb0571 Repaired an oversight from [8772] that let made certain types of fields with choices fail. Fixes #6967 again. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 19:20:03 +00:00
Jacob Kaplan-Moss
ea05e61b2b Fixed #8209: ModelForms now validate unique constraints. Alex Gaynor did much of this work, and Brian Rosner helped as well. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 19:08:08 +00:00
Jacob Kaplan-Moss
e545058ba9 Fixed #8354: the MySQL backend no longer raises a cryptic error. Instead, it raises a less-cryptic error. Obiously this isn't a perfect solution by any means, but it'll do until we can revisit timezone handling in the future. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8802 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 17:48:39 +00:00
Jacob Kaplan-Moss
15206298ed Revert [8799]. That wasn't ready for prime-time yet -- thanks, git-svn! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 17:38:59 +00:00
Jacob Kaplan-Moss
429c87fef8 A failing test for #8354 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 17:22:34 +00:00
Russell Keith-Magee
f55b834c2f Fixed #7302: Corrected quoting of columns in extra_group_by. Thanks to Ivan Sagalaev for the patch and initial test. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 12:07:26 +00:00
Malcolm Tredinnick
2d7feda05c Fixed #7512 -- Fixed an oversight when I first fixed ordering on nullable 
foreign keys (r7761). Thanks to George Vilches for the test case here.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8783 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 02:43:55 +00:00
Malcolm Tredinnick
4480645ac3 Fixed #8316 -- Put tighter restrictions on the type of Foreign Key fields 
created for MySQL (because MySQL + InnoDB has those restrictions).
Patch from julianb.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-01 00:49:03 +00:00
Malcolm Tredinnick
7838493b9e Fixed #8726 -- When doing reverse URL resolving, make sure we're consistently 
dealing with unicode strings throughout by promoting up from UTF-8 as necessary.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 22:47:25 +00:00
Brian Rosner
d511996901 Enforce max_num=1 on inline model formsets that have a unique foreign key to its parent. I snuck in a quick clean up to the inlineformset_factory as well. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 21:14:46 +00:00
Jacob Kaplan-Moss
3b63953704 Fixed #6967: ModelForms now validate choices. Thanks, mattmcc -- the failing test helped quite a bit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 20:11:11 +00:00
Jacob Kaplan-Moss
4ae746b574 Added a TypedChoiceField which acts just like ChoiceField, except that it 
returns a value coerced by some provided function. Refs #6967.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 20:10:50 +00:00
Jacob Kaplan-Moss
86316f0be6 Fixed #7027: template tags now corectly break tokens around strings marked for translation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 18:28:06 +00:00
Malcolm Tredinnick
6390155f5c Added a couple of extra tests to ensure url tag robustness. These are an 
attempt to verify #8726.

Refs #8726.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 17:29:49 +00:00
Malcolm Tredinnick
e1ea7014ad Fixed #8725 -- Handle empty URL patterns in reverse(). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 17:20:40 +00:00
Malcolm Tredinnick
24bacb19de Fixed #5216 -- Fixed a case of a string not being a unicode string. 
Thanks to Vadim Fint for the test case.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8761 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 11:39:06 +00:00
Malcolm Tredinnick
a63a83e5d8 A rewrite of the reverse URL parsing: the reverse() call and the "url" template tag. 
This is fully backwards compatible, but it fixes a bunch of little bugs. Thanks
to SmileyChris and Ilya Semenov for some early patches in this area that were
incorporated into this change.

Fixed #2977, #4915, #6934, #7206.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 11:11:20 +00:00
Brian Rosner
27f9b96fa0 Fixed handling of primary keys in model formsets. Model formsets should now work nicely with custom primary keys that are OneToOneField, ForeignKey and AutoField. Added tests to handle each of them. 
Fixes #8241, #8694, #8695 and #8719.

Thanks Karen Tracey, jonloyens, sciyoshi, semenov and magneto for tracking down various parts of this patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-31 09:49:55 +00:00
Jacob Kaplan-Moss
ae72e25b35 Fixed #8716: correctly handle name and email in comments from authenticated users. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 21:30:02 +00:00
Jacob Kaplan-Moss
15644cb255 Fixed #8622: accessing POST after a POST handling exception no longer throws the server into an infinite loop. Thanks to vung for tracking this one down and fixing it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 19:56:14 +00:00
Jacob Kaplan-Moss
f2d7ee759a Fixed #8710: removed a few stray tabs. Thanks, gkelly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 19:25:40 +00:00
Malcolm Tredinnick
c0b53b3dcc Removed the need for ROOT_URLCONF in settings when running Django's core tests 
(via runtests.py). It was embarrassing having to explain the need for it to
people, since we ignore whatever setting is passed in.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 05:09:03 +00:00
Malcolm Tredinnick
fd0cc45828 [8721] introduced some internal field names. We hide them from the list of 
valid field names in debugging output so that it doesn't confuse things.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-30 04:52:56 +00:00
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
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
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
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
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
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