0
0
mirror of https://github.com/django/django.git synced 2024-11-30 15:10:46 +01:00
Commit Graph

5676 Commits

Author SHA1 Message Date
Malcolm Tredinnick
556fbc78a6 Fixed #8039 -- Make sure that extra(tables=...) tables are always included in
the resulting SQL. Previously, an optimisation was removing them in some corner
cases.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 22:38:36 +00:00
Justin Bronn
b25d759bed Fixed #8113. Made get_width_height a GoogleZoom method that takes the extent instead of an envelope so it may handle Point geometries. Thanks to Santiago Aguiar for the bug report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 21:09:28 +00:00
Malcolm Tredinnick
e3ea9ddef5 Added a test to show that #8063 doesn't seem to be an issue any longer.
Refs #8063.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 20:18:52 +00:00
Malcolm Tredinnick
2c4b13cbe7 Changed the (internal) way extra(select=.., select_params=...) handling is done
so that parameters stay with their select items. This means that merging and
trimming of those items is handled correctly.

Refs #7957, #7961. Fixed #8191.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 20:07:59 +00:00
Malcolm Tredinnick
c92b424e57 Fixed #8239 -- Google App Engine has a restricted "imp" module, which doesn't
include one of the methods we use when constructing management help commands.
So postpone the resolving of the method name until when we actually need it
(which isn't run as part of GAE). Patch from Guido van Rossum.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 17:35:33 +00:00
Malcolm Tredinnick
98be841549 Fixed #8238 -- If an invalid database backend is mentioned in settings and the
environment doesn't support os.listdir(), we crashed whilst trying to construct
the friendly error message. This was not so friendly.

This patch handles that case (which occurs in real life in Google App Engine).
Patch from Guido van Rossum.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 17:32:31 +00:00
Malcolm Tredinnick
a80a5ae46f Fixed #8374 -- Add the admindocs/templates/ directory to the source tarball
that is built.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 05:43:34 +00:00
Brian Rosner
4ecdbc52af Fixed #8373 -- Corrected a bad link in the admin.txt documentation. Thanks jarrow for catching my mistake.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 05:19:40 +00:00
Brian Rosner
219304019b Fixed #8353 -- Corrected the case when adminform is not in the context when rendering {% prepopulated_fields_js %} in the admin. Thanks evan_schulz for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 05:16:16 +00:00
Russell Keith-Magee
15f8b4cde0 Fixed #8178: Another update to debug template to aid rendering of exception traces. Thanks to julianb for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 04:27:36 +00:00
Malcolm Tredinnick
260510453f Fixed #7241 -- More robust exception catching in the transaction management
code. As pointed out in the ticket, Python still lets you raise all sorts of
odd things as exceptions (e.g. strings), so even though they're bad form, we
should still handle them. We do that cleanly now. Thanks to jim-django@dsdd.org
for the patch.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-17 00:07:06 +00:00
Malcolm Tredinnick
2d2396a384 Fixed #5133 -- Explicitly close memcached connections after each request
(similar to database connection management). We can't effectively manage the
lifecycle by pooling connections and recent versions of python-memcache can
lead to connection exhaustion in some quite reasonable setups.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 23:35:58 +00:00
Malcolm Tredinnick
f505bd6e41 Documented that GenericForeignKey fields can't be used transparently in
filters. Refs #3006. Patch from rmyers.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 22:44:42 +00:00
Malcolm Tredinnick
7c6071861e Fixed #8132 -- Updated tutorial 2 to describe the current way to customise the
main admin page. Based on a patch from julien.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 22:25:20 +00:00
Gary Wilson Jr
a949f9ec7d Fixed #3121 -- Made get_or_create() work for RelatedManager and ManyRelatedManager.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8415 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 20:59:06 +00:00
Justin Bronn
a2be52fd2a Fixed #6547, added support for GeoRSS feeds in django.contrib.gis.feeds; added the feed_extra_kwargs and item_extra_kwargs to the Feed baseclass so that it's possible for subclasses to add dynamic attributes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8414 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 20:40:47 +00:00
Malcolm Tredinnick
c127f0117d Fixed #8283 -- Fixed an edge case when adding things to the "where" tree and
combining different connector types.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8413 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 20:40:00 +00:00
Ramiro Morales
4dece4fba1 Updated the es_AR localization.
There was no need to update djangojs domain files.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8412 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 17:22:02 +00:00
Malcolm Tredinnick
844089de07 Fixed #8315 -- If an exception is raised whilst trying to rollback a
transaction (after another exception in the code), make sure the original
exception is reported, rather than the rollback-generated one. The latter is
almost certainly a consequence of the former. Patch from Karen Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 15:58:30 +00:00
Malcolm Tredinnick
54f9a98713 Fixed #8351 -- Fixed the returned value when we attempt to load a cache-backed session object that doesn't alreayd exist.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8410 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 15:54:36 +00:00
James Bennett
6bcb4935f2 Fixed #8007: removed mention of admin options in models from docs/design_philosophies.txt
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8409 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 14:41:28 +00:00
James Bennett
df284da44f Fixed #8267: Corrected documentation for default value of DEFAULT_FILE_STORAGE setting
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 14:35:17 +00:00
Russell Keith-Magee
3afa4a4626 Fixed #8178: Cleaned up the rendering of exceptions on the error template. Thanks to Marinho Brandão for the fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 12:33:36 +00:00
James Bennett
ceb8fc56af Fixed #6915: Documented the fact that QuerySet.delete() may not call delete() methods of individual objects
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 10:17:46 +00:00
Russell Keith-Magee
cbcc415934 Fixed #8229: Added handling for a special case in the validation of Spanish ID numbers. Thanks to Marc Garcia for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 07:00:30 +00:00
Russell Keith-Magee
77c949289e Fixed #7285: Improved inspectdb handling of dashes in table and field names. Thanks to redalastor@gmail.com for the report and Justin Bronn for the first part of a fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 05:03:40 +00:00
Russell Keith-Magee
eab705f623 Fixed #6935: Modified inspectdb to provide better handling for table names with spaces. Thanks to adamv for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8403 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 04:51:21 +00:00
Russell Keith-Magee
7299b39752 Fixed #8355: Removed some whitespace that was apparently causing difficulty with script compilation. Thanks to bear330 for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8402 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 04:48:57 +00:00
Russell Keith-Magee
0345fec71b Fixes #7845: Removed a piece of stale code that was causing ./manage.py reset to fail with apps that don't have any models. Thanks to miracle2k for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 04:11:38 +00:00
Russell Keith-Magee
fc2c03b55c Fixed #8268: Modified admin scripts tests to use JYTHONPATH when appropriate. Thanks to leosoto for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 02:29:10 +00:00
Gary Wilson Jr
2b82a3bcfc Fixed #7331 -- Made QueryDict.iteritems behave like QueryDict.items, thanks jurev.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-16 02:17:55 +00:00
Gary Wilson Jr
ddc156bca2 Fixed #6970 -- Raise the original IntegrityError when all required fields aren't specified in get_or_create instead of a misleading DoesNotExist error, thanks deadwisdom.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 23:29:55 +00:00
Malcolm Tredinnick
3b45a40c54 Fixed #8219 -- More robust date to string conversion in syndication feeds.
(Sometimes) Affects people running in locales that use non-ASCII date strings.
Patch from alperkanat.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 22:13:50 +00:00
Brian Rosner
f67fb604ea Fixed #8341 -- Allow simpler subclassing of ModelAdmin and InlineModelAdmin when overriding get_form and get_formset and needing to pass keyword argument on to the factory functions. Thanks ciantic for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 21:57:36 +00:00
Brian Rosner
8edb4f97c7 Fixed #8299 -- Clarified the ModelAdmin.form option. Also added an inner Meta class to the ModelForm example in adding custom validation to the admin. Thanks jarrow for the report and initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 21:37:34 +00:00
Brian Rosner
6a71c768bc Fixed #8352 -- Corrected a typo in the contenttypes.txt documentation. Thanks cjs for the ticket.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 21:14:22 +00:00
Gary Wilson Jr
6d863fef8a Fixed #5270 -- Allow template tags and filters to accept an emtpy string, patch from jdunck.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 21:08:11 +00:00
Brian Rosner
0ca738363a Fixed #8292 -- Honor filter_horizontal and filter_vertical in inlines correctly. It now adds the right Javascript to handle them when they are the only ones on the page. Thanks dakrauth for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 20:33:45 +00:00
Gary Wilson Jr
727133109c Fixed #8290 -- Fixed DecimalField's cleaning of values with a large number of decimal places, based on patch from dgouldin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 20:09:47 +00:00
Brian Rosner
9d1ec0b5ec Fixed #5385 -- Made the date returned from the calendar picker consistent with the usual format of dates in the admin. Thanks Petr Marhoun for the ticket and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 19:51:45 +00:00
Jarek Zgoda
4cfa5afcc7 Polish locales updated
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 19:33:49 +00:00
Brian Rosner
417a4d66df Removed some checks for Model._meta.one_to_one_field to prevent list_filter and the show_result_count in search_form.html. Fixes #2145.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 19:15:20 +00:00
Gary Wilson Jr
c0d862d638 Fixed a typo and added a bit more ReST markup to cache middleware docstring.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8387 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 17:47:03 +00:00
Gary Wilson Jr
3bb50169d9 Removed unused and redefined imports.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 17:42:13 +00:00
Brian Rosner
d7467a0bfc Fixed #957 -- prepopulated_fields now works correctly on inlines.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 17:38:39 +00:00
Brian Rosner
f586c0b039 Fixed media creation in the add_view. It was not pulling media from the correct place.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 17:36:33 +00:00
Gary Wilson Jr
415bf3efb3 Fixed #7364 -- Never cache the contrib.auth login view.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 17:10:14 +00:00
Gary Wilson Jr
90c67e0f55 Fixed typo in comment.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8382 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 16:38:41 +00:00
Malcolm Tredinnick
0d48087a53 Made a few small tweaks to reduce persistent storage accesses in the session
backend. Refs #8311, although doesn't fix the problem there.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 14:59:11 +00:00
Malcolm Tredinnick
93462f9516 Reverted [8318] and [8329], since the change turned out to have no effect, upon
closer examination of the C-library layer.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8380 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-15 14:58:59 +00:00