1
0
mirror of https://github.com/django/django.git synced 2025-07-19 17:19:12 +00:00

6712 Commits

Author SHA1 Message Date
Brian Rosner
38d9b0919b [0.5.X] Fixed #9462 -- Set the instance in an inline formset correctly so that None does not get passed through to the queryset. Thanks tobias and copelco for the ticket.
Backport of r9293 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 20:03:56 +00:00
Karen Tracey
84216ef05e [1.0.X] Fixed #8966 -- Changed is_safe for length_is filter to False, since its return value is a boolean, not a string.
Thanks Thomas Steinacher, carljm, and SmileyChris.

Backport of r9291 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9292 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 19:04:59 +00:00
Karen Tracey
a8a07c2057 [1.0.X] Fixed #9039 take 2 -- Modified the new tests added in [9240] so they pass on Oracle.
Backport of [9288] from trunk, also updated svnmerge.py metadata.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 16:30:19 +00:00
Karen Tracey
98b1b0794c [1.0.X] blocked commit related to new feature from svnmerge.py consideration.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 16:25:42 +00:00
Justin Bronn
9db7d53b60 Fixed MySQLGeoField to create spatial indexes again.
Backport of r9286 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-28 00:47:49 +00:00
Justin Bronn
e4ea2e12e1 Fixed #9448 -- Layer objects now carry a reference to their parent DataSource. Thanks, Matthew D. Hancher for the bug report.
Backport of r9284 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9285 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-26 22:30:56 +00:00
Justin Bronn
3517f8a5ac Fixed #9391 -- AdminSite and ModelAdmin now exposed in django.contrib.gis.admin for API consistency and convenience.
Backport of r9282 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-26 18:12:31 +00:00
James Bennett
d2f6a84668 [1.0.X] Remove obsolete reference to "development version" in autoescaping docs.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-26 03:10:48 +00:00
Karen Tracey
bffc238a2f [1.0.X] Fixed #7179 -- Changed breadcrumbs on the add page so that a link to the change view is not included when the user doesn't have permission for that view. Also added tests to ensure the link is not there when it shouldn't be, and there when it should be. Thanks for the report & patch alen__ribic.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 19:18:10 +00:00
Karen Tracey
d323ef20d3 [1.0.X] Fixed #9411 -- Changed the test from r9081 to be more robust across different database backends.
Backport of [9254] from trunk (I neglected to mention in the ticket this affected 1.0.X branch).

Also updated svnmerge metadata; all eligible fixes have been backported and all others blocked.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 18:13:35 +00:00
Karen Tracey
71ae6cbfa4 [1.0.X] block [9248] (feature) and [9263] (updated translation) from svnmerge consideration.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 16:39:28 +00:00
Malcolm Tredinnick
74c799d21d [1.0.X] Fixed #9307 -- Added the ability to pickle the Query class used by the
Oracle backend.

This allows Querysets to be cached for Oracle and should provide a model for
adding pickling support to other (external) database backends that need a
custom Query class.

Thanks to Justin Bronn for some assistance with this patch.

Backport of r9272 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:40:12 +00:00
Malcolm Tredinnick
0a1aafa581 [1.0.X] Fixed #9434 -- Added a note to the mod_python docs regarding requiring
PythonInterpreter in different VirtualHost blocks that share the same server
name. Thanks to Graham Dumpleton for the clarification.

Backport of r9268 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:30:53 +00:00
Malcolm Tredinnick
13d810efe4 [1.0.X] Fixed #9432 -- Revived documentation of ~Q usage.
Backport of r9267 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:30:04 +00:00
Malcolm Tredinnick
8613e6c53e [1.0.X] Fixed #9430 -- Fixed documentation references to the HttpResponse
classes for returning HTTP status codes other than 200.

Backport of r9266 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9269 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 09:29:27 +00:00
Malcolm Tredinnick
122c1a9ac0 [1.0.X] Fixed #9339 -- Small update to the Simplified Chinese translation from lidaobing.
This is the same typo fix as r9264 on trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9265 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:46:59 +00:00
Malcolm Tredinnick
8158bd9380 [1.0.X] Fixed #9424 -- Typo fix.
Backport of r9258 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9262 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:21:04 +00:00
Malcolm Tredinnick
8cf2a05d35 [1.0.X] Fixed #9420 -- Fixed an exception type in the documentation of
Queryset.get().  Based on a suggestion from daveyjoe.

Backport of r9257 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:20:29 +00:00
Malcolm Tredinnick
568cb5d87c [1.0.X] Fixed #9390 -- Restored some documentation about select_related() that
was accidentally lost in the docs refactor.

Backport of r9256 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:19:45 +00:00
Malcolm Tredinnick
73ea785d6b [1.0.X] Fixed #9384 -- Fixed a couple of typos. Thanks, Thomas Güttler and romke.
Backport of r9255 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 07:19:07 +00:00
Malcolm Tredinnick
6c85612499 [1.0.X] Backed out r9250. I committed this to the branch by mistake; there's no
bug in functionality fixed by this. Refs #9383.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9253 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 06:15:54 +00:00
Malcolm Tredinnick
b52e45193f [1.0.X] Fixed #9406 -- Ensure that each database column is only represented
once in the "ORDER BY" clause of an SQL statement.

Backport of r9251 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 06:11:37 +00:00
Malcolm Tredinnick
43f6136f0f [1.0.X] Fixed #9383 -- Don't open a network connection for sending email if
there's nothing to send. Saves a bit of time when, for example, processing
500-error emails with no ADMINs configured. Based on a patch from Jesse Young.

Backport of r9248 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 04:41:58 +00:00
Malcolm Tredinnick
f762dcdf65 [1.0.X] Fixed #9410 -- I did not spell Portuguese correctly 18 months ago.
Fixed now. Thanks, kimus.

Backport of r9247 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-24 04:40:51 +00:00
Karen Tracey
74997f95de [1.0.X] Fixed #9252 -- Moved the try/except protecting against incorrect lookup params to where the error is now raised, and added a test for this case.
Backport of [9245] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-22 23:14:48 +00:00
Brian Rosner
d7ebda8d08 [1.0.X] Display non_field_errors of inline forms in the admin. This was a presentation bug.
Backport of [9243] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-21 20:27:17 +00:00
Karen Tracey
118383c607 [1.0.X] Fixed #3096 -- Make admin list_filters respect limit_choices_to.
Backport of [9241] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-21 19:06:44 +00:00
Karen Tracey
bd60c52c3c [1.0.X] Fixed #9039 -- Don't perform unique checks on NULL values, since NULL != NULL in SQL.
Backport of [9239] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-21 14:07:36 +00:00
Justin Bronn
663a284817 Fixed #9361 -- thanks to Guillaume for the bug report and patch.
Backport of r9237 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-21 04:45:55 +00:00
Ian Kelly
3c5688d4e0 [1.0.X] Fixed #9136: Do slicing in Oracle with rownum instead of
row_number() for a speed improvement. Thanks, Guillaume Taglang.

Backport of [9235] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-18 00:02:26 +00:00
Karen Tracey
36e90e5736 [1.0.X] Fixed #8110 -- Allow for AdminLogNode's render to be called more than once.
Backport of [9233] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-17 22:46:08 +00:00
Ian Kelly
4537f33487 [1.0.X] Fixed Oracle introspection mapping of DATE columns, and added an
entry for Oracle 10g native float columns.

Backport of r9231 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9232 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-13 19:41:48 +00:00
Karen Tracey
743019f8fd [1.0.X] Updated svnmerge.py metadata.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9229 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-11 14:21:36 +00:00
Malcolm Tredinnick
909371e5e5 [1.0.X] Fixed .distinct() not working with slicing in Oracle, due to the
row numbers necessarily being distinct.

Backport of r9221 from trunk (since Ian doesn't have commit privileges at the
moment).


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9228 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-11 00:26:11 +00:00
Jacob Kaplan-Moss
6cfbd52138 [1.0.X] Yet more file storage testing cleanup for the sake of buildbots; this should be the last of it, I hope.
Backport of r9226 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9227 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-10 22:14:24 +00:00
Jacob Kaplan-Moss
4d692e6af1 [1.0.X] More be-nice-to-the-buildbot: be better about cleaning up files created by the cache/session tests.
Backport of r9924 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-10 21:42:26 +00:00
Jacob Kaplan-Moss
a47f32449a [1.0.X] Be nice to buildbots: switched modeltests/files to use a proper isolated directory for file storage
Backport of r9222 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-10 20:14:52 +00:00
Brian Rosner
194de934ff [1.0.X] Corrected a typo in the 1.0 porting guide.
Backport of [9219] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9220 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-09 23:38:09 +00:00
Malcolm Tredinnick
94c210427f [1.0.X] Fixed #9239 -- Somebody read my form validation docs from r9180 and
found a typo in them. I guess that was predictable. Thanks, Berry Groenendijk

Backport of r9217 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-09 09:33:35 +00:00
Malcolm Tredinnick
f0ba276fd6 [1.0.X] Fixed #9325 -- Typo fix in the forms documentation.
Backport of r9215 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9216 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-09 09:21:22 +00:00
Malcolm Tredinnick
5e9a9053d8 [1.0.X]Fixed #9328 -- Added Scot Hacker to AUTHORS and moved a couple of other
names to their alphabetical locations.

Backport of r9213 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9214 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-09 09:01:30 +00:00
Karen Tracey
9810648bef [1.0.X] Fixed #9053 -- Allowed for sorting of callable and ModelAdmin methods specified in list_display (added in r8352). Previously attempting to sort on the former would raise an exception and the latter simply didn't sort. Also added tests for this function. Thanks rgl and jenan.
Backport of [9211], also updated svnmerge.py metatdata.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 14:57:34 +00:00
Karen Tracey
aea426561a [1.0.X] Blocked new feature r9188 from consideration by svnmerge.py.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9210 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 14:15:39 +00:00
Malcolm Tredinnick
ced447ee97 [1.0.X] Fixed #9319 -- Fixed a crash when using the same model field in multiple
unique_together constraints.

Backport of r9208 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 10:11:02 +00:00
Malcolm Tredinnick
a9936d0b1c [1.0.X] A queryset that has had ordering removed (order_by()) can have ordering
added again later (order_by('foo')). Or, at least, it can now. Thanks to Ilya
Novoselov for diagnosing the problem here.

Backport of r9206 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9207 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 09:48:21 +00:00
Malcolm Tredinnick
4b687d01ba [1.0.X] Fixed #6748 -- When printing the repr() of querysets, don't load or
display more than 20 objects.

This means that accidentally executing HugeStoryArchive.objects.all() at the
interactive prompt (or in the debug template) won't try to load all 4,233,010
stories into memory and print them out. That would previously cause resource
starvation and other "interesting" crashes.

If you really, really want the previous behaviour (e.g. in a doctest that
prints more than 20 items), display "list(qs)" instead of just "qs".

Backport of r9202 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9205 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 08:44:17 +00:00
Malcolm Tredinnick
09d84c4d40 [1.0.X] Applying a limit to a queryset that already had an upper limit of 0
wasn't working properly.

Backport of r9201 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 08:43:31 +00:00
Malcolm Tredinnick
318c1c32dd [1.0.X] The tests added in r9185 were altering the test environment in bad
ways. Fixed this with proper setUp() and tearDown() methods.

Backport of r9200 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9203 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-08 08:42:39 +00:00
Malcolm Tredinnick
b3c2cf3d1d [1.0.X] Fixed #9233 -- Allow date and message-id headers to be passed in
manually in email messages. Previously we were creating duplicate headers,
which was bad.

Backport of r9197 from trunk. I'm calling this a bugfix, since the docs are
unclear about which headers you can pass into an EmailMessage constructor.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9198 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 12:26:00 +00:00
Malcolm Tredinnick
742ff0800b [1.0.X] Fixed #9215 -- Added a view/template example of using pagination.
Based on a patch from shacker and Matt Dennenbaum.

Backport of r9193 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9196 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-07 11:58:40 +00:00