Russell Keith-Magee
5c05233ffc
Fixed #14455 -- Documented the backwards compatibility policy for local flavors. Implemented the policy for the changes in the Indonesian local flavor (from r14195) that stimulated the development of this policy. Thanks to Karen, Alex, Ramiro and Chris for their help developing the policy.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-01 00:52:58 +00:00
Alex Gaynor
282e53b499
Reflow django/contrib/auth/management/__init__.py for readability.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-31 16:49:36 +00:00
Alex Gaynor
15b3350d30
Fixed the auth tests so they work when the AUTHENTICATION_BACKENDS setting is a list. Thanks to Patrick Altman for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-31 16:25:29 +00:00
Alex Gaynor
aa951eb8ea
Ensure that the staticfiles tests use the MEDIA_ROOT they intended, also use a more approrpiate datastructure in collectstatic.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14401 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-30 23:39:53 +00:00
Russell Keith-Magee
ccc49029b8
Fixed #14181 -- Added a template tag and filters to allow localization to be disabled in a template. Thanks to Benjamin Wohlwend for the work on the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-29 16:48:58 +00:00
Alex Gaynor
c38a174f7c
Remove several uses of the deprecated dict.has_key in favor of the in operator. This is faster, has less code, and is in every single way better.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-29 04:24:53 +00:00
Russell Keith-Magee
ea85d4303d
Fixed #14231 -- Added an index to the expire_date column on the Session model. Thanks to joeri for the report, via Frodo from Medid.
...
This won't affect any existing session tables; see the release notes for migration instructions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-28 11:56:37 +00:00
Chris Beaven
e716a71bad
Revert the removal of an unused import (in [14175]) that was referenced in documentation. Thanks for noticing, clong.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14359 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-27 07:08:15 +00:00
Justin Bronn
eccc42a8c7
Fixed #13617 -- `OSMGeoAdmin` now works again when `USE_L10N` (or `LANGUAGE_CODE`) is set. Thanks, Federico Hlawaczek, for workaround and piquadrat for patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14341 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-24 09:39:47 +00:00
Jannis Leidel
85ef6c0938
Fixed #14544 -- Squashed bug in the findstatic command when used with the --first option.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14324 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-23 14:32:54 +00:00
Jannis Leidel
58af951c30
Fixing a few cosmetic bugs. Thanks for the hint, Alex Gaynor.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 03:16:58 +00:00
Jannis Leidel
1c4868f4c1
Fixed #14507 -- Corrected the logic of the URL helpers and view of staticfiles to actual work like documented (only when settings.DEBUG is True). Thanks for the report and initial patch, mbi.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14306 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-21 03:16:41 +00:00
Luke Plant
7d0d3b68d6
Fixed bug and test failure introducted in [14290]
...
Thanks Russell for alerting me.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 07:59:17 +00:00
Jannis Leidel
cfc19f84de
Fixed #12323 and #11582 -- Extended the ability to handle static files. Thanks to all for helping with the original app, the patch, documentation and general support.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14293 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-20 01:33:24 +00:00
Luke Plant
46c17654ed
Fixed #14498 - Forms passed to FormWizard.process_step are not guaranteed to have cleaned_data
...
Thanks to stas for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 20:45:40 +00:00
Honza Král
f6a0b7cfe3
Fixed #14407 -- Simplified ManyToManyRawIdWidget.value_from_datadict, Thanks tyrion!
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-19 07:14:38 +00:00
Honza Král
31560e31f9
Fixed #13790 -- auto detection of m2m fields to Site. Thanks, gabrielhurley!
...
Tests are placed in the test suite and not the contrib app since they require
models to work
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14251 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-18 04:56:27 +00:00
Jannis Leidel
214dc97bf3
Fixed #13963 -- Use the correct verbose name of a reverse relation field in the admin. Thanks, sfllaw and d0ugal.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-17 15:17:52 +00:00
Alex Gaynor
5a8e40a03f
Fixed #11350 -- added an Israeli localflavor. Thanks to Yuval and Idan Gazit for their work on the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-15 02:58:10 +00:00
Luke Plant
45c7f427ce
Fixed #14445 - Use HMAC and constant-time comparison functions where needed.
...
All adhoc MAC applications have been updated to use HMAC, using SHA1 to
generate unique keys for each application based on the SECRET_KEY, which is
common practice for this situation. In all cases, backwards compatibility
with existing hashes has been maintained, aiming to phase this out as per
the normal deprecation process. In this way, under most normal
circumstances the old hashes will have expired (e.g. by session expiration
etc.) before they become invalid.
In the case of the messages framework and the cookie backend, which was
already using HMAC, there is the possibility of a backwards incompatibility
if the SECRET_KEY is shorter than the default 50 bytes, but the low
likelihood and low impact meant compatibility code was not worth it.
All known instances where tokens/hashes were compared using simple string
equality, which could potentially open timing based attacks, have also been
fixed using a constant-time comparison function.
There are no known practical attacks against the existing implementations,
so these security improvements will not be backported.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14218 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-14 20:54:30 +00:00
Luke Plant
5bf73dd909
Fixed reference to removed function root() in AdminSite docstring.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-14 01:24:20 +00:00
Honza Král
b7ed25a0f3
Fixed #14017 -- wrong comment on log_deletion method of ModelAdmin
...
Also added a transaction around the deletion view to preserve DB state (and rollback the creation of LogEntry object in case the deletion fails)
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14197 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-13 04:16:31 +00:00
Justin Bronn
2c3b710d0a
Fixed #13830 -- Updated province name in Indonesian localflavor. Thanks, rodin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-13 01:23:07 +00:00
Justin Bronn
120aae2209
Enabled area calculations for geography columns.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 17:13:27 +00:00
Russell Keith-Magee
03f00bcd42
Fixed #14447 -- Modified the auth and sitemaps tests to remove some assumptions about the environment in which the tests are run. Thanks to Gabriel Hurley for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14184 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 07:15:47 +00:00
Chris Beaven
e509c1527a
Fixed #14425 -- Unused imports in contrib.admin. Thanks robhudson.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14175 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-12 01:03:53 +00:00
Jannis Leidel
6ddfe26932
Fixed #14349 -- Added Belgium localflavor. Thanks for the report and patch, Laurent Luce.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14160 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 23:35:23 +00:00
Luke Plant
e0ec458360
Fixed #14433 - replaced a thread-unsafe solution to #10235 introduced in [13980]
...
This patch also addresses sitemap code found in contrib/gis, which [13980]
did not.
Thanks to gabrielhurley for the initial patch.
Refs #10235 , #14386
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14141 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 14:34:42 +00:00
Russell Keith-Magee
121d2e3678
Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 12:55:17 +00:00
Russell Keith-Magee
1070c57b83
Fixed #14436 -- Escalated 1.2 PendingDeprecationWarnings to DeprecationWarnings, and removed 1.1 deprecated code.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 12:20:07 +00:00
Alex Gaynor
5e5be2c44c
Fixed #14279 -- Corrected a typo in the sitemaps tests (didn't affect the passage of the test). Thanks to jamesodo for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-11 03:39:02 +00:00
Alex Gaynor
791cc62d4c
Don't mark a TemplateSyntaxError in flatpages as being translatable.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 17:54:20 +00:00
Andrew Godwin
c236d5e44d
Fixed #14193 : prepopulated_fields javascript now concatenates in correct order. Thanks to bmihelac for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14122 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 09:57:23 +00:00
Ramiro Morales
d084439c41
Fixed #12650 -- Don't generate invalid XHTML in the admin, databrowse apps when
...
the i18n context processor is active. Thanks to Rob Hudson for the report and
fix suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14104 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 01:57:56 +00:00
Luke Plant
05d438bdd9
Converted contrib/webdesign doctests to unittests. We thoroughly deplore those doctests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14101 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 01:06:56 +00:00
Luke Plant
f3429da6a0
Converted contrib/auth/tokens doctests to unittests. We've always said "no more" to doctests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-10 01:06:42 +00:00
Russell Keith-Magee
03e7d64de4
Ensure that the sitemaps test deactivates it's locale, so that subsequent tests aren't run in French.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 14:36:18 +00:00
Russell Keith-Magee
a904e55859
Fixed #11509 -- Modified usage of "Web" to match our style guide in various documentation, comments and code. Thanks to timo and Simon Meers for the work on the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 08:12:50 +00:00
Ramiro Morales
8058cc2e25
Fixed #12872 -- Removed vestiges of mythic old template validation admin app functionality.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 03:58:32 +00:00
Russell Keith-Magee
8755fb1549
Fixed #14354 -- Normalized the handling of empty/null passwords in contrib.auth. This also updates the createsuperuser command to be more testable, and migrates some auth doctests. Thanks to berryp for the report, and Laurent Luce for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-09 03:34:08 +00:00
Russell Keith-Magee
127a25ac27
Fixed #14383 -- Corrected the capitalization of reStructuredText. Thanks to timo for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 15:37:16 +00:00
Russell Keith-Magee
ed32170a04
Fixed #13218 -- Ensure that syndicated content served over HTTPS uses https:// links by default. Thanks to schaefer for the report, and Ben Firshman for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 14:14:05 +00:00
Russell Keith-Magee
f53491db6e
#14374 -- Added some missing template files to ensure that contrib.auth tests will pass when admin isn't installed. Thanks to henriquebastos for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-08 13:50:54 +00:00
Luke Plant
2faa490aeb
Fixed #5425 - Incorrect plurals in admin pagination template.
...
Thanks to Petr Marhoun for the report, and mk for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-07 22:30:38 +00:00
Adrian Holovaty
157583f916
Fixed #14412 -- Pointed contrib.comments comments-url-redirect URLpattern at the actual view instead of the deprecated view. Thanks, subsume
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-06 22:56:52 +00:00
Adrian Holovaty
47cae1a2f6
Fixed #14414 -- Improved contenttypes shortcut() view to check that the ContentType has a model_class(). Thanks, subsume
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-06 22:55:06 +00:00
Luke Plant
667d832e90
Fixed #14386 , #8960 , #10235 , #10909 , #10608 , #13845 , #14377 - standardize Site/RequestSite usage in various places.
...
Many thanks to gabrielhurley for putting most of this together. Also to
bmihelac, arthurk, qingfeng, hvendelbo, petr.pulc@s-cape.cz , Hraban for
reports and some initial patches.
The patch also contains some whitespace/PEP8 fixes.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-04 14:20:47 +00:00
Jannis Leidel
941e11e54d
Fixed #14363 -- Fixed render method of ManyToManyRawIdWidget to set attrs to an empty dict. Thanks, tyrion and dpn.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:31:05 +00:00
Jannis Leidel
113b0bde66
Fixed #14362 -- Made sure all parameters are passed to the ManyToManyRawIdWidget. Thanks, tyron.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:30:45 +00:00
Jannis Leidel
524b6bae29
Fixed tabs introduced in r13968.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:05:45 +00:00
Jannis Leidel
392d992f82
Fixed #7048 -- Added ClearableFileInput widget to clear file fields. Thanks for report and patch, jarrow and Carl Meyer.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-10-01 02:02:58 +00:00
Justin Bronn
ea07fe7a3f
Fixed a geographic sitemaps regression introduced in r13876.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-27 00:20:42 +00:00
Jannis Leidel
1df1378f9e
Fixed #13827 -- Cleaned up a few unnecessary function calls.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13876 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-26 21:36:22 +00:00
Luke Plant
763bcf8472
Fixed paste-o in [13855]
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-14 21:40:23 +00:00
Luke Plant
34a4af50be
Fixed #2283 (again) - comment form templates don't validate as XHTML
...
Thanks to hjoreteg/thejaswi_puthraya for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-14 14:22:35 +00:00
Luke Plant
86031bf59d
Fixed #14252 - django.contrib.flatpages unit tests assume default value for settings.LOGIN_URL
...
Thanks to pmclanahan for report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-13 23:09:56 +00:00
Malcolm Tredinnick
4084bc7354
Permit custom from-email address in auth forms email.
...
Patch from cassidy and Rob Hudson. Fixed #11300 .
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 22:38:01 +00:00
Justin Bronn
553374b55d
Fixed #14060 -- PostGIS never implemented the `~=` operator for geography types, so removed support for it.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13757 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 02:07:04 +00:00
Justin Bronn
f6074506fd
Fixed regression in running the GeoDjango test suite after r13670 with addition of `GeoDjangoTestSuiteRunner` (replaces `run_gis_tests`, which is now a stub).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-12 01:40:42 +00:00
Justin Bronn
9e04c3b744
Fixed #13149 -- The admin `ForeignKeyRawIdWidget` now properly handles non-integer values. Thanks, Chris Adams.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 18:34:40 +00:00
Justin Bronn
04f50c1f28
Fixed #13599 -- No longer embed hidden `<td>` elements in `ChangeList` that cause improper rendering when `list_editable` is enabled; refactored `admin_changelist` tests. Thanks, skevy for bug report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13744 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-11 03:01:07 +00:00
Karen Tracey
5912903852
Fixed #11358 : Don't include private flatpages in sitemap. Thanks dburke and mlavin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 23:30:46 +00:00
Malcolm Tredinnick
c5772009c1
Fixed id attribute generation in the admin docs page. Patch from simeon.
...
Fixed #3695 . Thanks.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 22:37:17 +00:00
Jannis Leidel
bb00b28399
Added login_url argument to login_required decorator. Thanks mhlakhani and ericflo for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 19:38:57 +00:00
Malcolm Tredinnick
443cb9b6ed
Fixed date parsing of 31st dates when current month has 30 days (!!).
...
Patch from rich@tablexi.com . Fixed #2975 .
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 18:09:18 +00:00
Malcolm Tredinnick
003ed01bb3
Admin changelist page now has consistent width with or without filter
...
bar.
Patch and testing from Kronuz and radez.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 17:49:42 +00:00
Malcolm Tredinnick
30610719d5
Adding related objects in the admin (via popup) respects user
...
permissions. Patch from SmileyChris. Fixed #1035 .
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-10 16:56:36 +00:00
Luke Plant
303bdc85a7
Fixed #14242 - UserChangeForm subclasses without 'user_permissions' field causes KeyError
...
This was a regression introduced by [13683]
Thanks to adammckerlie@gmail.com for report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 23:31:54 +00:00
Luke Plant
801bb146e8
Converted tests for contrib.auth.forms to unit tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-09 23:21:16 +00:00
Luke Plant
ef4b29a001
Fixed #13081 - Admin actions lose get-parameters in changelist view
...
Thanks to joh for report and to SmileyChris for patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-07 20:55:53 +00:00
Luke Plant
bdd13a4daa
Fixed #14090 - Many sql queries needed to display change user form
...
Thanks to Suor for report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-09-03 18:56:12 +00:00
Russell Keith-Magee
0de3e7a756
Fixed #14198 -- Corrected rendering of generic sitemaps when no priority is specified. Thanks to palkeo for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 15:09:12 +00:00
Russell Keith-Magee
6909c22663
Fixed #13798 -- Added connection argument to the connection_created signal. Thanks to liangent for the report, and Alex Gaynor for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 13:21:18 +00:00
Russell Keith-Magee
a5c80a28dc
Added a missing (empty) models.py file required for the tests from r13644 to actually run.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-30 12:32:26 +00:00
Russell Keith-Magee
120070ed47
Fixed #13723 -- Improved the legibility of hyperlinks included in admin validation error messages. Thanks to Sebastian Noack for the suggestion and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 12:45:03 +00:00
Russell Keith-Magee
80dd2edabb
Fixed #14166 -- Modified the list of state choices in the Indian localflavor to be a list of tuples, not just a list of values. Thanks to gogna for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 12:28:56 +00:00
Russell Keith-Magee
72a7167439
Fixed #5192 -- Modified flatpage admin form to allow ~ and . characters in flatpage names. Thanks to marco.giusti@gmail.com for the report, Idan Gazit for summarizing the issue on the ticket, and ctrochalakis for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 12:25:54 +00:00
Russell Keith-Magee
e1e2726957
Fixed #6932 -- Added a template tag that gives a list of available flatpages for a given user. Thanks to Dmitri Fedortchenko for the suggestion, and to Mnewman, faldridge and Simon Meers for their work on the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 11:59:14 +00:00
Russell Keith-Magee
34740625ff
Removed a stray DEBUG=True test setting introduced in r13641.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-28 06:12:54 +00:00
Russell Keith-Magee
46fab8983e
Fixed #14164 -- Ensure that sitemap priorities aren't rendered with localized numerical formats. Thanks to dokterbob for the report, and vung for the draft patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-27 15:16:04 +00:00
Russell Keith-Magee
3f96a7a358
Fixed #14156 -- Modified the way CSRF protection is applied to flatpages so that the flatpage middleware doesn't cause all POSTs resulting in 404s to turn into 403s. Thanks to patrys for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-27 13:55:11 +00:00
Russell Keith-Magee
3c99d06229
Fixed #13951 -- Corrected docstring in formtools wizard. Thanks to suzaku for the report, and lrekucki for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-23 08:11:24 +00:00
Russell Keith-Magee
7e52bb2bc3
Fixed #13796 -- Ensure that builtin tags and filters are included in admin documentation views.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 13:41:56 +00:00
Russell Keith-Magee
597e03cd74
Fixed #14096 -- Corrected Python 2.4 syntax issue. Thanks to PaulM for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13579 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-14 12:11:02 +00:00
Russell Keith-Magee
c4b6edf3b8
Fixed #12746 -- Updated sorting calls to use 'key' instead of 'cmp'. This will be slightly faster in certain circumstances, but more importantly, is a required step for migration to Python 3. Thanks to Martin van Loewis for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:31:44 +00:00
Russell Keith-Magee
cefee67b7d
Fixed #14014 -- Ensure that the "save and add another" button for users actually does what it says. Thanks to Ramiro for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 16:08:40 +00:00
Russell Keith-Magee
2ab3b52d2a
Fixed #14012 -- Corrected the handling of the create user popup dialog in the admin. Thanks to gk@lka.hu for the report, and Ramiro Morales for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-06 14:58:05 +00:00
Luke Plant
5eece23296
Converted sessions tests from doctest to unittest.
...
Also made the FileSession backend consistent with other backends in one
corner case uncovered by the conversion, namely that the backend should
create a new key if the one passed in is invalid.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13482 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-08-05 11:49:58 +00:00
Justin Bronn
aaa5dfbf53
Fixed #13967 -- MySQL spatial backend now respects when `spatial_index=False`. Thanks, Simon Law, for bug report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13443 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-21 15:23:18 +00:00
Justin Bronn
87a60e28cc
Fixed #13934 -- `GeoSQLCompiler.get_default_columns` was missing `local_only` keyword argument. Thanks, Simon Law, for bug report and initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13439 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-07-20 19:05:46 +00:00
Justin Bronn
096c465358
Fixed #13779 -- Can now discover GDAL 1.7 from debian-based packages. Thanks to Leo for bug report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-23 17:17:22 +00:00
Luke Plant
5ff262e8bf
Fixed #12803 - Added styling for 'error' and 'warning' messages in admin.
...
Thanks to bboli and sebastian_noack for the report, DrMeers for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-23 13:14:30 +00:00
Jacob Kaplan-Moss
90ce8b0c99
Fixed #10843 : the textile tests now pass against the latest textile library.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13360 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-06-19 21:07:33 +00:00
Jannis Leidel
286ce85e45
Fixed #13569 -- Fixed createsuperuser management command to work with the new relaxed requirements for usernames.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13297 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21 14:08:49 +00:00
Jannis Leidel
b057a8b247
Fixed #13560 -- Fixed localization of widgets.
...
Particularly this fixes the SplitDateTimeField and the AdminDateWidget by localizating the widget's value in its render method instead of the form field. Thanks to David Danier for the report and Russell for help with the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13296 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-21 14:07:54 +00:00
Russell Keith-Magee
23976fa4b5
Fixed #13486 -- Corrected handling of %I in admin javascript version of strftime. Thanks to Bufke for the report, and jmil for the solution.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-12 11:00:12 +00:00
Russell Keith-Magee
16c64bc2b7
Fixed #13521 -- Corrected javascript comparisons determining when to show and hide the 'add another' inline button. Thanks to darkrho for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13234 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-11 13:40:17 +00:00
Jannis Leidel
13532eb9ea
Fixed #12892 - Fixed unicode related bug in a utility function of the admindocs app that prevented it to be used in non-English environments together with certain versions of docutils.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 11:20:36 +00:00
Jannis Leidel
e3a3175d45
Fixed #13168 - Corrected the alignment of the admin inline headers for rtl languages. Thanks for the report and patch, benc.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-10 11:20:17 +00:00
Brian Rosner
4cf4acba45
Fixed #1834 -- added docstrings to admin templatetags
...
Thanks Rupe for work on a patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-08 21:38:14 +00:00
Justin Bronn
33d4aa8df1
Removed duplicated code from `django.contrib.gis.db.backend` and added a deprecation note about the module.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-05 16:06:39 +00:00
Jannis Leidel
9bdd17579d
Fixed #13472 - Fixed minor regression in admin actions template introduced in r12968. Thanks for the report, Carl Meyer.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 22:13:14 +00:00
Justin Bronn
402f8cede5
Fixed #13315 , #13430 -- Recreated `django.contrib.gis.db.backend` module with `SpatialBackend` alias and added `Adaptor` alias for backwards-compatibility purposes; added GeoDjango 1.2 backwards-incompatibility documentation and release notes; added a section in the docs about how MySQL is a crippled spatial database; updated versions in install docs.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13097 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 21:43:40 +00:00
Russell Keith-Magee
5211f48ae3
Fixed #12164 -- Removed the Python 2.3 compatibility imports and workarounds. Thanks to timo and claudep for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 14:00:30 +00:00
Russell Keith-Magee
e99b283e77
Fixed #13459 -- Corrected numbering of tr elements in the admin. Reverts the changes introduced in r13068. Thanks to 3point2 for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-04 07:23:02 +00:00
Jannis Leidel
cce32a9b09
Fixed #13166 - Added JavaScript warnings to admin changelist to help against ambiguity between action and list_editable form submission. Thanks to blinkylights and aaugustin for the report and initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-02 23:02:16 +00:00
Russell Keith-Magee
cb02b92f85
Fixed #13459 -- Corrected ID numbering of dynamically added inlines in the admin. Thanks to 3point2 for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-02 13:25:13 +00:00
Russell Keith-Magee
21d98c5ebd
Fixed #13443 -- Added required CSS class to the column headings on admin TabularInline formsets. Thanks to deschler for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-30 15:24:07 +00:00
Russell Keith-Magee
12cc292fc1
Fixed #13387 -- Removed some duplicated departments in the French localflavor. Thanks to Pinaraf for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-20 15:05:05 +00:00
Jacob Kaplan-Moss
ea7df23395
Fixed #11967 : use a different technique to get `ADMIN_MEDIA_PREFIX` in admin JS.
...
We now store ADMIN_MEDIA_PREFIX on the window object and let JS files read it
from there. The old technique -- looking a <script> tags and trying to deduce
the prefix -- broke with libraries like TineMCE that dynamically add <script>
tags to the <head>.
This is potentially backwards-incompatible for folks who've overridden
`admin/base.html`; they'll need to add the proper <script> line to
their new `admin/base.html`. For that reason, this changeset shouldn't
be backported to 1.1.X.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 18:37:12 +00:00
Jannis Leidel
c3dbe9d509
Fixed #13361 - Made sure jQuery is always included in the admin changelist and changeform. Thanks to Carl Meyer for report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-19 10:16:25 +00:00
Justin Bronn
1ad9c36fb8
Fixed #11810 -- Fixed typo and errors that prevented `modifiable` from working in the geographic admin. Thanks to Rob Coup for the bug report. Refs #12504 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 16:34:42 +00:00
Russell Keith-Magee
2cd48bac7e
Fixed #13358 -- Ensured that db_manager() can be used to override database routing on M2M, reverse FK and generic key queries. Thanks to Craig Kimerer for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12993 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 12:29:23 +00:00
Russell Keith-Magee
94a968cfc6
Fixed #13357 -- Minor changes to get Django running under PyPy. Thanks to Alex Gaynor for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12991 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-16 11:11:55 +00:00
Karen Tracey
a213599db7
Fixed #9427 : Allow for autodiscover to load admin modules from apps in eggs. Thanks clint and metzen.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-15 22:32:53 +00:00
Jannis Leidel
b3390fede0
Fixed #13290 - Added a section about minification of admin JavaScript files to the contributing docs. Thanks to Gabriel Hurley for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12969 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 10:29:44 +00:00
Jannis Leidel
31f7ff1518
Fixed #12903 - Made translating the admin action selection text easier. Thanks to Ramiro Morales for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12968 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 10:29:19 +00:00
Jannis Leidel
c3d1267c15
Also minify the JavaScript file for pre-populated form fields in the admin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 10:28:44 +00:00
Jannis Leidel
1fcf747b13
Fixed #12882 - Moved the admin's jQuery into our own namespace to lower the risk of a clash with third party apps that use jQuery.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-13 10:28:24 +00:00
Russell Keith-Magee
217a379c3d
Fixed #13229 -- Updated the list of Finnish municipalities in localflavor. Thanks to Haprog for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:59:00 +00:00
Brian Rosner
2a752edd80
Fixed #11957 -- exceptions in admin.py are no longer hidden after second request
...
Before you had to restart runserver for the correct exception message to show
up again. Reverts fix in r9680 which has this side-affect.
Thanks to jarrow, carljm and ramiro for their work on the patch and tickets.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12956 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 14:36:48 +00:00
Justin Bronn
82b8b67446
Fixed #9437 -- Now close the connection after getting the PostGIS version during spatial backend initialization.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 18:59:03 +00:00
Russell Keith-Magee
faceca7075
Fixed #13301 -- Corrected problem with capitalization of changelist row headers in admin. Thanks to emyller for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-11 08:35:04 +00:00
Russell Keith-Magee
056c940f0d
Fixed #13304 -- Updated auth decorators so they can be used with callable classes. Thanks to Horst Gutmann for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-09 11:07:17 +00:00
Luke Plant
736b751ed9
Fixed #13068 , #9264 , #9983 , #9784 - regression with pre-populated fields and javascript inlines, and related bugs.
...
Thanks to hejsan for the report, and to Sean Brant and Carl Meyer for the patch.
#13068 is a regression caused by the new javascript inline forms in the
admin. The others were existing javascript bugs with prepopulated fields.
Since the solution depends on jQuery and would likely be very hard to
backport without it, it will not be backported to 1.1.X.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-07 23:37:48 +00:00
Russell Keith-Magee
90d112785b
Fixed #13038 -- Ensured that readonly fields in the admin have their name added as a CSS class. Thanks to andybak for the report, and javimansilla, fisadev and fgallina for their work on the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 15:37:43 +00:00
Russell Keith-Magee
653b27dcf2
Fixed #13129 -- Corrected CSS on RTL layout when a changelist has admin actions and is filtered. Thanks to mksoft for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:59:17 +00:00
Russell Keith-Magee
304e017a7f
Fixed #12260 -- Corrected CSS when using checkbox widgets on a ModelMultipleChoiceField in admin. Thanks to tiliv for the report and fix.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:36:36 +00:00
Russell Keith-Magee
c421a4fd92
Fixed #11949 -- Added a hook to allow ModelAdmin customization of the delete selected template. Thanks to bendavis78 for the report and patch, and Ramiro Morales for his cleanup work.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-05 12:02:27 +00:00
Justin Bronn
7d5c7df6a9
Fixed #13256 -- `OGRGeometry` no longer raises an exception when compared to instances of different types. Thanks, ninowalker for the bug report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-01 16:56:55 +00:00
Justin Bronn
2fa2cf0a09
No longer use the deprecated GEOS C API function `GEOSGeomFromWKB_buf` when unpickling `GEOSGeometry` objects.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 18:55:52 +00:00
Russell Keith-Magee
a75dc3406f
Fixed #13250 -- Corrected a problem with the use of routing rules on the create() call on a Foreign Key. Thanks to chris@xlevus.net for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 12:33:10 +00:00
Justin Bronn
7bdb9a90d0
PostGIS 1.5 allows distance queries on non-point geographic geometry columns with `ST_Distance_Sphere`, enabled this functionality.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-30 23:15:43 +00:00
Russell Keith-Magee
dafc077e4a
Fixed #12945 -- Corrected the parsing of arguments in {% url %} when the argument list has spaces between commas. This is a revised version of r12503, which was a fix for #12072 . Thanks to SmileyChris for the patch, and to dmoisset for finding all the places in the docs that the old style syntax was used.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-30 12:44:30 +00:00
Justin Bronn
539cfe8cb7
Fixed #8904 -- Improved error message when spatial lookup is not available, and changed exception to `ValueError` to prevent swallowing of error on queryset evaluation.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-30 01:13:47 +00:00
Justin Bronn
7e5265785a
Fixed #10594 -- `GeoQuerySet` measurment methods no longer crash on geometry fields with NULL values. Thanks, whiteinge for the bug report and yourcelf for the initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 22:20:38 +00:00
Justin Bronn
381b10c2c6
Added another GDAL bug workaround for retrieving the correct coordinate dimension on geometry collections. Refs #12312 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 21:56:01 +00:00
Justin Bronn
85fa7d8894
Fixed #13070 -- Introduced fallback code to detect SpatiaLite 2.3.0 versions (which do not have `spatialite_version` function).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 19:40:59 +00:00
Justin Bronn
85e13681b0
Fixed #11785 -- Clarified error message when the layer geometry type doesn't match the model field. Thanks, esizikov for bug report and initial patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 18:33:23 +00:00
Justin Bronn
87302ac009
Fixed #12312 -- Set the coordinate dimension on each component of geometry collections after transform (refines GDAL bug workaround introduced in r11628). Thanks, yourcelf for bug report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-29 17:33:59 +00:00
Jannis Leidel
2a4990a5de
Updated jQuery to 1.4.2.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 23:04:18 +00:00
Jannis Leidel
aba95dcc0b
Fixed #13023 - Removed ambiguity with regard to the max_num option of formsets and as a result of admin inlines. Thanks to Gabriel Hurley for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 23:03:56 +00:00
Jannis Leidel
9df8d9c294
Fixed #13175 - Fixed an off-by-one error in the admin inline JavaScript that resulted in wrong form field prefixes. Thanks DrMeers for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-27 23:03:12 +00:00
Gary Wilson Jr
8f3d6b9404
Removed out-of-date statement in markdown templatetags docstring (refs #1204 ).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 23:56:08 +00:00
Gary Wilson Jr
84de614529
Fixed #13174 -- Fixed missing field label for `readonly_fields` when used in `StackedInline`, thanks to benc for the report and ptone for the investigation and initial patch.
...
* Corrected `InlineAdminForm.__init__` to pass along `model_admin` parameter in `super` call.
* Lookup the field label in the form's model, not the `model_admin` model.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-26 23:38:05 +00:00
Justin Bronn
9b50ec81a3
Peform smarter version detection of GDAL so development versions are supported.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 20:00:27 +00:00
Russell Keith-Magee
962defed0a
Fixed #13200 -- Updated the DB session backend to make full use of routers, deprecating the need for the SESSION_DB_ALIAS setting. Thanks to rokclimb15 for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12844 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 10:29:06 +00:00
Russell Keith-Magee
8dbd8b1c29
Fixed #13177 -- Corrected usage of firstof in admin templates. Thanks to nomulous for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 14:52:51 +00:00
Karen Tracey
f88c2f16e8
Fixed #13004 : Ensure the add page for a model with a ManyToManyField specified
...
in readonly_fields does not raise an exception. Thanks hejsan, mlavin, copelco.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-21 14:23:25 +00:00
Karen Tracey
8661cb9bd3
Fixed #13170 : Make get_level and set_level importable from django.contrib.messages,
...
as documented. Thanks dm, SmileyChris, tobias.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-21 13:47:50 +00:00
Jannis Leidel
3f4fef432b
Fixed #12778 - Added media handling abilities to admin inlines. Thanks for the patch, pmclanahan.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-21 01:54:00 +00:00
Karen Tracey
4528f39886
Fixed #12962 : Made admin delete action work again. Thanks ptone, skevy, mlavin and anyone else I've missed.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-20 14:53:17 +00:00
Karen Tracey
e434573ef1
Changed the comments post view code to avoid raising an exception if handed invalid data for the object pk. Thanks to Leo for the test.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12800 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 22:37:45 +00:00
Karen Tracey
883329ecb3
Fixed #12105 : Corrected handling of isnull=False lookups in admin. Thanks marcob, Travis Cline, gabrielhurley.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-16 19:01:40 +00:00
Russell Keith-Magee
e89a5e06cf
Fixed #12998 -- Corrected handling of time zones in syndication framework.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 15:25:39 +00:00
Russell Keith-Magee
2d57300f52
Fixed #12953 -- Ensure that deletion cascades through generic relations. Also cleans up the special-casing of generic relations in the deleted object discovery process. Thanks to carljm for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 13:15:01 +00:00
Jannis Leidel
7989a78baf
Fixed #13000 - Use a dictionary for the error messages definition in user creation and change form. Thanks for the patch, lgs.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 12:16:01 +00:00
Jannis Leidel
a03f675876
Fixed #13026 - Also update the index of lookup links when adding inlines dynmacially in the admin. Thanks to ramusus and Rob Hudson for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 12:15:44 +00:00
Russell Keith-Magee
45a56e637e
Fixed #12339 -- Made content type deletion an interactive process to prevent accidentally cascade deleting content from a production database. Thanks to kcarnold for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 09:57:57 +00:00
Russell Keith-Magee
4dfe6190fa
Fixed #13108 -- Corrected an ambiguity in test data with the potential to cause test failures out of the box. Thanks to benreynwar for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12778 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 06:55:56 +00:00
Russell Keith-Magee
fbf00078e1
Fixed #12940 -- Modified some admin actions in contrib.comments to use ungettext in order to support Russian (and similar) pluralization rules. Thanks to void for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 15:32:06 +00:00
Russell Keith-Magee
1db672f347
Fixed #12999 -- Modified the contenttypes syncdb handler to use db router logic. Thanks to lsbardel for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-10 12:34:49 +00:00
James Bennett
a0c77ada99
Ensure that NullBooleanField displays the appropriate icon for null values in admin changelists. Refs #13071 .
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-10 08:37:17 +00:00
Karen Tracey
bb72aca5d4
Fixed #12689 : Fixed admin validation to report an error on invalid exclude specification. Thanks for report to bparker and for patch with tests to ramiro.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-09 00:38:53 +00:00
Karen Tracey
021ba30ad1
Fixed #12481 : Updated admin validation code to not reject non-editable fields in readonly_fields, since these are handled fine by the display code itself. Thanks lashni and Alex.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 20:36:37 +00:00
Karen Tracey
f2bc4dd0a9
Fixed #12024 : Changed admin code to avoid raising an exception when a field listed
...
in raw_id_fields has limit_choices_to specified as a Q object.
Tweaked a test to trigger the condition and verify the fix.
Finally, documented that limit_choices_to specified as a Q object has no effect
on the choices available for fields listed in raw_id_fields, and removed another
incorrect note that claimed limit_choices_to had no effect on inlines in the admin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 18:32:24 +00:00
Karen Tracey
80545c3685
Fixed #12151 : Ensured the comments code does not cause a server error when a request comes in for a comment specifying an invalid primary key value. Thanks thejaswi_puthraya.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-05 20:17:52 +00:00
Karen Tracey
2890c2295b
Fixed #11465 : Ensure nonexistent pks enterd in an admin raw id field do not
...
cause a server error. Thanks for report and initial patch sacre@wp.pl .
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 02:28:49 +00:00
Jacob Kaplan-Moss
17c466a57b
Fixed a silly bug in [12644].
...
Kids, please don't drink and code; the commit you save might be your own.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 23:59:22 +00:00
Jacob Kaplan-Moss
4c18facdf7
Fixed #1104 : set `FormWizard.extra_context` in `__init__` to avoid context leakage.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 23:26:08 +00:00
Jacob Kaplan-Moss
973bf6f485
Fixed #5605 : only lowercase the domain portion of an email address in `UserManager.create_user`.
...
Thanks, Leo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:30:44 +00:00
Jacob Kaplan-Moss
8b2662c5de
Fixed #10878 , an error in the `Moderator` docstring.
...
Thanks, Travis Cline.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:18:52 +00:00
Jacob Kaplan-Moss
6e748b5db4
Fixed #11457 : tightened the security check for "next" redirects after logins.
...
The new behavior still disallows redirects to off-site URLs, but now allows
redirects of the form `/some/other/view?foo=http://...`.
Thanks to brutasse.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 19:58:53 +00:00
Jacob Kaplan-Moss
c8015052d9
Fixed #5786 : relaxed the validation for usernames to allow more common characters '@', etc.
...
This is really just a stop-gap until we come up with a improved way of handling
disparate auth data, but it should help us stretch a bit more milage out of the
current system.
Thanks to alextreme, lbruno, and clayg.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 19:49:05 +00:00
Karen Tracey
d2dffd78e6
Fixed #11791 : Put hidden input elements in the change list inside td elements so they're valid HTML. Thanks panni and mlavin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 18:43:27 +00:00
Jannis Leidel
e889b69dd2
Fixed #12966 - Force unicode of verbose labels in admin change messages.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 14:34:24 +00:00
Jannis Leidel
2dafe4ac3a
Fixed #12903 - Added plural forms to a few strings in the admin actions template.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 14:34:07 +00:00
Luke Plant
d7abb33e70
Fixed #12933 - AdminSite.admin_view disables @csrf_view_exempt
...
Thanks to philomat for report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27 21:08:30 +00:00
Karen Tracey
9fab1467c7
Removed more stray tabs in Python files.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27 16:30:27 +00:00
Russell Keith-Magee
41c30f2fb8
Fixed #12981 -- Removed some stray tabs. Thanks to loewis for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27 05:38:17 +00:00
Russell Keith-Magee
e12b3199d0
Fixed #6191 , #11296 -- Modified the admin deletion confirmation page to use the same object collection scheme as the actual deletion. This ensures that all objects that may be deleted are actually deleted, and that cyclic display problems are avoided. Thanks to carljm for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 13:17:43 +00:00
Justin Bronn
dc1ad69f30
Fixed #11353 -- `GeometryProxy` descriptor no longer chokes when accessed from a class rather than an instance, thanks yml and Tobu; removed unnecessary imports from `types` and cleaned up whitespace.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 21:20:02 +00:00
Joseph Kocherhans
3f443363f9
Fixed #11681 . Fixed display of non_field_errors and non_form_errors in the admin. Thanks, nessita.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12541 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 18:56:00 +00:00
Joseph Kocherhans
f2d5582c53
Fixed #12561 . InlineAdmin now respects can_delete=False. Thanks, nessita.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 17:14:50 +00:00
Joseph Kocherhans
7aeb37d610
Fixed #12707 . Admin action messages are no longer displayed when submitting list_editable content. Thanks, copelco.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 14:48:15 +00:00
Russell Keith-Magee
6b2f125b80
Fixed #12729 -- Replaced a hard-coded SQL statement with an ORM query so that the contrib.auth ModelBackend will work on a routed multi-db setup. Thanks to dhageman for the report.
...
Historical note: The SQL that was removed predates Django being open sourced.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 12:02:41 +00:00
Justin Bronn
1d5165e3be
Fixed #12776 -- `User.get_profile` now raises `SiteProfileNotAvailable` instead of `AttributeError` in certain circumstances. Thanks, Bruno Renié.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12506 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 05:52:37 +00:00
Joseph Kocherhans
a3e2ddde65
Fixed #12570 . Removed unused fields from GenericForeignKey. Thanks, specialunderwear.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12492 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 15:48:19 +00:00
Russell Keith-Magee
eb67e449dd
Fixed #12864 -- Corrected handling of new user creation when a multi-database router is in place. Thanks to haris@dubizzle.com for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 13:09:02 +00:00
Justin Bronn
a9b2ac25d1
Fixed #9147 -- Added `FormPreview.process_preview` customization hook. Thanks, bthomas and thalin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12486 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 05:00:36 +00:00
Jannis Leidel
67d4289c2e
Fixed #12066 - Moved auth context processor from core to the auth app. Thanks, Rob Hudson.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-21 23:40:47 +00:00
Justin Bronn
eaa17e13e8
Fixed #12705 -- Date/time and select filter widgets now work again with newly added inline forms in the admin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-17 18:54:02 +00:00
Russell Keith-Magee
b794441951
Fixed #10976 -- Isolated contrib.auth tests so they will always pass, regardless of any local templates. Thanks to aarond10 for the report, and SmileyChris for turning that into a patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 12:02:11 +00:00
Luke Plant
4bff194633
Fixed #12804 - regression with decorating admin views.
...
This is a BACKWARDS INCOMPATIBLE change, because it removes the flawed
'auto_adapt_to_methods' decorator, and replaces it with 'method_decorator'
which must be applied manually when necessary, as described in the 1.2
release notes.
For users of 1.1 and 1.0, this affects the decorators:
* login_required
* permission_required
* user_passes_test
For those following trunk, this also affects:
* csrf_protect
* anything created with decorator_from_middleware
If a decorator does not depend on the signature of the function it is
supposed to decorate (for example if it only does post-processing of the
result), it will not be affected.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-09 15:02:39 +00:00
Jannis Leidel
edb6d753a8
Fixed #12716 - Typo in the admin change list template. Thanks, kbrownlees.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12398 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-07 15:55:40 +00:00
Jannis Leidel
fdb9f83253
Fixed #12748 - Use charAt instead of array-like access to format string to please IE. Thanks, yedpodtrzitko.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12397 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-07 14:42:16 +00:00
Jannis Leidel
f5ee28931d
Fixed #12793 - Only use the admin actions JavaScript if not explicitly deactivated with 'actions = None' in the ModelAdmin. Thanks, Florian Apolloner.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12396 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-07 14:41:43 +00:00
Luke Plant
def34da85c
Fixed #12358 - csrf_token template tag does not work with flatpages.
...
Thanks to phretor for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-04 21:47:19 +00:00
Jannis Leidel
5dad2350f7
Use a closure for embedding the admin actions JavaScript and updated the minified versions a little bit.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:16:44 +00:00
Jannis Leidel
816fced5d7
Being a good citizen, adding the jQuery license and a command line script to easily minify the jQuery based scripts.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-01 14:16:01 +00:00