mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Code Issues Releases Wiki Activity
6,498 Commits 28 Branches 423 Tags 717 MiB
cc4e4d9aee
Commit Graph

6498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell Keith-Magee
cc4e4d9aee Fixed #3566 -- Added support for aggregation to the ORM. See the documentation for details on usage. 
Many thanks to:
 * Nicolas Lara, who worked on this feature during the 2008 Google Summer of Code.
 * Alex Gaynor for his help debugging and fixing a number of issues.
 * Justin Bronn for his help integrating with contrib.gis.
 * Karen Tracey for her help with cross-platform testing.
 * Ian Kelly for his help testing and fixing Oracle support.
 * Malcolm Tredinnick for his invaluable review notes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9742 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-15 11:06:34 +00:00
Gary Wilson Jr
50a293a0c3 Updated name as per author's request. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-15 06:37:01 +00:00
Jacob Kaplan-Moss
1f84630c87 Fixed #6470: made the admin use a URL resolver. 
This *is* backwards compatible, but `admin.site.root()` has been deprecated. The new style is `('^admin/', include(admin.site.urls))`; users will need to update their code to take advantage of the new customizable admin URLs.

Thanks to Alex Gaynor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-14 20:22:25 +00:00
Justin Bronn
6c4e5f0f0e Fixed #9278, #9694 -- Geographic overlays now display in admin with right to left langauges; simplified transformation process in OpenLayersWidget to fix Ubuntu 8.10/Apache 2.2.9 crash; updated OpenLayers version to 2.7. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-13 02:08:26 +00:00
Jacob Kaplan-Moss
ffeb1d0465 Fixed #9346: fixed comment upgrade SQL in documentation. Thanks, mt. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9732 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-12 17:31:40 +00:00
Jacob Kaplan-Moss
3990d00f20 Fixed #9959: fixed comment documentation example showing how to get a preview. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-12 17:29:01 +00:00
Jacob Kaplan-Moss
4035ea3538 A few small fixes to django.contrib.comments (Comment.get_as_text for non-authenticated users; references to Comment.permalink; unused imports). Fixes #9143, #9429, and 9439. Thanks, Thejaswi Puthraya. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-12 17:27:41 +00:00
Gary Wilson Jr
11d382c6c4 Fixed a long line, a typo, and a few misspellings from [9727]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-11 05:47:06 +00:00
Jacob Kaplan-Moss
c01098e9cb In urlconfs, include() may now be used on an iterable of patterns instead of just a module string. Refs #6470 -- making the admin use a urlconf is much easier with this work done. Thanks, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-10 22:54:20 +00:00
Jacob Kaplan-Moss
299e1e814f Fixed #6791: added a write-through cache session backend: session data is written through the cache to the database, but read from the cache for speed. Thanks to jhenry, mcroydon, and jdunck. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-10 22:18:14 +00:00
Malcolm Tredinnick
d32c290846 Revised r9566 slightly to be backwards compatible with versions 1.0 - 1.0.2. 
Also documented the change. We prefer to load directory_index.html for static
directory listings, but if you have the (older style) "directory_index"
template and no .html version, we'll load that. This should stop a bunch of
mysterious breakages when people upgrade to Django 1.0.3 or Django 1.1. Also
keeps the docs in sync with released code.

Fixed #9993.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-09 12:41:07 +00:00
Jarek Zgoda
0e59fbbd85 Updated Polish translation: fixed typo and one missing translation 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-09 09:57:53 +00:00
Malcolm Tredinnick
73e5823f61 Fixed #9569 -- Small correction to Simplified Chinese translation. 
Thanks, isoemail@163.com and neomana@gmail.com for the confirmation.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-08 10:33:36 +00:00
Malcolm Tredinnick
95b0c2569d Fixed #9636 -- Updated simplified Chinese translation. 
Thanks, Liang Feng and Li Daobing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9721 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-08 10:32:55 +00:00
Malcolm Tredinnick
67c1c516ab Fixed #9888 -- Updated Japanese translation from Takashi Matsuo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-08 10:12:48 +00:00
Malcolm Tredinnick
c5bdfab9ae Fixed #9985 -- qs.values_list(...).values(...) was constructing incorrect SQL. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-08 05:49:03 +00:00
Malcolm Tredinnick
d068ad0c01 Using querysets as an rvalue in filter() calls was causing an unnecessary 
database query, due to a bool() call. This change stops that behaviour.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-08 05:16:21 +00:00
Malcolm Tredinnick
d00c013cc8 Remove any ordering from a nested select query (in the where-clause). 
This fixes r9701 for Oracle (the test introduced there did its job and failed
previously).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9714 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-08 05:15:41 +00:00
Ian Kelly
c20019a91d Fixed #9972: The dbshell command was ignoring the DATABASE_HOST and DATABASE_PORT settings in Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-08 05:12:14 +00:00
Justin Bronn
300752bd6c Return None for null date/time fields in OGR-supported data sources. Thanks to Ariel Mauricio Nunez Gomez for bug report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-07 20:21:19 +00:00
Ian Kelly
bde7e79fb3 Refs #9935: Added a note in the documentation to the effect that Django currently requires a 4.X release of cx_Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9709 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-06 18:22:07 +00:00
Malcolm Tredinnick
e77c4cca26 Fixed #9963 - Added a trivial tests.py file to the files produced by "startapp". 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-06 05:27:39 +00:00
Malcolm Tredinnick
a9c2f033cd Upgraded included simplejson to 2.0.7. 
Also changed importing logic to prefer a system-installed version of
simplejson (unless it's an earlier version that does not contian the C
speedups), then the json module from Python 2.6, then the version
shipped with Django.

Fixed #9266.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-06 05:13:02 +00:00
Malcolm Tredinnick
3b489b7742 Documented that case-insensitive matching is not supported for non-ASCII 
strings in SQLite. Refs #9905.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9705 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-06 03:34:47 +00:00
Malcolm Tredinnick
0c08368116 Fixed #9862 -- For better SQL portability, don't specify "NULL" on nullable 
columns when creating tables. Patch from Ian Kelly.

Columns are NULL by default, so we only need to use "NOT NULL" when we want
non-default behaviour.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9703 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-06 01:56:13 +00:00
Justin Bronn
391736e737 Updated GeoWhere to be compatible with changes in r9700. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-05 22:16:12 +00:00
Malcolm Tredinnick
f747b61c20 Nested query support. 
This extends previous functionality that allowed passing Query objects as the
rvals to filters. You can now pass QuerySets, which requires less poking at
opaque attributes. See the documentation of the "__in" lookup type for the
details.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-05 11:47:48 +00:00
Malcolm Tredinnick
062a94ef45 Reconciling where- and having-clause behaviour. 
Extricated the code that works directly with SQL columns (standard
"where" stuff) from the the code that takes SQL fragments and combines
it with lookup types and values. The latter portion is now more
generally reusable. Any existing code that was poking at Query.having
will now break in very visible ways (no subtle miscalculations, which is
a good thing).

This patch, en passant, removes the existing "having" test, since the
new implementation requires more setting up than previously. The
aggregates support (currently in a separate codebase) has tests for this
functionality that work as a replacement for the removed test.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-05 11:47:14 +00:00
Russell Keith-Magee
ff4b844cb4 Added a link to RKM's blog in the committers file. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9698 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-03 05:04:12 +00:00
Russell Keith-Magee
1fc26b8d4e Modified the entry for David Larlet in the AUTHORS file to be consistent with the entry already present in the 1.0.X branch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-03 04:52:07 +00:00
Russell Keith-Magee
096a9ecc5c Fixed #9942 -- Added a to_python handler for FloatField to ensure correct typing of deserialized data before saving. Underlying problem is analogous to #8298, fixed in [8515]. Thanks to David Larlet <larlet@gmail.com> for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9695 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-03 04:43:58 +00:00
Justin Bronn
3cd1e80ae4 Fixed check_geom and check_srs to accept larger sized pointer addresses as returned by some platforms (including OpenBSD 4.4 and Fedora 8). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9693 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-03 01:37:51 +00:00
Luke Plant
a754165a91 Fixed #9637: Use 'block.super' in admin 'extrastyle' blocks to preserve changes in base_site.html 
The current admin templates do not need this.  However, a common way to customize admin
appearance is to provide your own 'base_site.html' template, and add stylesheets using
the extrastyle block.  Without this patch, these customizations are lost.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@9690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-27 00:01:11 +00:00
Justin Bronn
50cd258a24 Fixed #9664 -- LayerMapping now works with MySQL spatial backends. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-26 20:04:11 +00:00
Justin Bronn
d39540af92 Fixed #9892 -- support additional binary packages for GEOS & GDAL libs on OSX & Ubuntu platforms. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-26 16:02:45 +00:00
Adrian Holovaty
89dc5b894a Added some documentation explaining (1) that it's possible to add users via the Django admin site, and (2) that in order to be able to add users via the admin site, you need to have both 'add user' and 'change user' permissions. Refs #9866 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-25 06:19:14 +00:00
Adrian Holovaty
be2697209b Improved the auth admin site to raise Http404 with a helpful error message if DEBUG is True, explaining why permission isn't denied. Refs #9866, and see also [9682] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-25 06:17:42 +00:00
Adrian Holovaty
62362c6175 Added comment to UserAdmin.add_view() explaining why we disallow users without change permissions from adding other users. Refs #9866 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9682 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-25 06:04:11 +00:00
Gary Wilson Jr
9af56803f5 Fixed #8245 -- Added a LOADING flag to autodiscover to prevent an admin.py module with errors from raising a spurious AlreadyRegistered exception in a subsequent call to autodiscover. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-23 18:25:24 +00:00
Gary Wilson Jr
f0d44e44bd Fixed #9882 -- Added alters_data = True to BaseModelForm.save method, thanks dc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9678 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-23 05:50:51 +00:00
Gary Wilson Jr
7bf9626adb Fixed #9884 -- Corrected template example in model forms documentation, thanks bradmontgomery. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-23 05:20:49 +00:00
Gary Wilson Jr
05737128de Fixed #9902 -- Corrected misspelling in form validation documentation, thanks zunzun. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-23 04:13:14 +00:00
Gary Wilson Jr
bcae5fc1b3 Fixed #9896 -- Corrected a couple uses of formset.forms, thanks aglzen. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-23 00:13:15 +00:00
Gary Wilson Jr
c565352954 Fixed #9780 -- Fixed an undefined internal link in the model forms documentation, thanks ramiro. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-23 00:01:09 +00:00
Gary Wilson Jr
d66e63f2dc Fixed #9904 -- Corrected name of storage method in files documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9668 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-22 23:21:32 +00:00
Malcolm Tredinnick
9d13b6ec28 Changed some ReST formatting of headers (in forms/validation.txt). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9666 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-22 04:18:00 +00:00
Karen Tracey
ca33f07e2c Fixed #9865 -- Allow saving of new inline-edited objects with custom non-auto primary key fields that are not the foreign key to the parent object. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-21 04:56:32 +00:00
Karen Tracey
04ed423469 Fixed #9898 -- Added a missing 'e' to 'one'. Thanks gizzywump. Also Americanized specialised while in the area, per contributing's guideline. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9662 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-21 04:17:46 +00:00
Malcolm Tredinnick
dc4c95cdbf Fixed a typo in r9650. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-17 01:47:08 +00:00
Karen Tracey
986e162c5d Follow-up to r9656 -- beef up the added test to exercise all (one can hope) paths through the troublesome get_deleted_objects function and fix the resulting errors. 
Refs #9859.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-16 17:42:18 +00:00