Commit Graph

1187 Commits

Author SHA1 Message Date
Karen Tracey 08a698ed46 [1.1.X] 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. 

Backport of r12648 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 02:39:26 +00:00
Jacob Kaplan-Moss 5f70a72876 [1.1.X] Fixed a silly bug in [12644].
Backport of [12646].

Of course, this sort of thing *does* do wonders for my commit count.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-02 00:00:08 +00:00
Jacob Kaplan-Moss 60f4b7c4a9 [1.1.X] Fixed #1104: set `FormWizard.extra_context` in `__init__` to avoid context leakage.
Backport of [12644] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 23:26:44 +00:00
Jacob Kaplan-Moss 34a3b7b6fd [1.1.X] Fixed #5605: only lowercase the domain portion of an email address in `UserManager.create_user`.
Thanks, Leo.

Backport of [12641] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:32:55 +00:00
Jacob Kaplan-Moss ac72c8d1d3 [1.1.X] Fixed #10878, an error in the `Moderator` docstring.
Thanks, Travis Cline.

Backport of [12639] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:19:53 +00:00
Jacob Kaplan-Moss 6b94c64554 [1.1.X] 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.

Backport of [12635] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 20:06:20 +00:00
Karen Tracey 5f3a53036d [1.1.X] Fixed #11791: Put hidden input elements in the change list inside td elements so they're valid HTML. Thanks panni and mlavin.
r12631 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 18:46:20 +00:00
Jannis Leidel 4871b654b5 [1.1.X] Fixed #12966 - Force unicode of verbose labels in admin change messages.
Backport of r12627.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-01 14:36:45 +00:00
Karen Tracey e0679ef165 [1.1.X] Removed more stray tabs in Python files.
Applicable parts of r12616 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27 16:37:32 +00:00
Karen Tracey 0c2d3ff7a1 [1.1.X] Python 2.3 compatibility: moved the fallback import for set to where set() is now used.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 14:24:08 +00:00
Russell Keith-Magee 3bda1f5bd3 [1.1.X] 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.
Backport of r12598 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 13:43:28 +00:00
Justin Bronn 231eb1d3ac [1.1.X] Fixed #12828 -- The table quoting function is now argument `get_geo_where_clause`.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12587 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 21:59:27 +00:00
Justin Bronn 49194df8c3 [1.1.X] 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.
Backport of r12584 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12585 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 21:26:11 +00:00
Joseph Kocherhans a1bff5f823 [1.1.X] Fixed #11681. Fixed display of non_field_errors and non_form_errors in the admin. Backport of r12541 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12542 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 19:00:50 +00:00
Joseph Kocherhans 6510822679 [1.1.X] Fixed #12561. InlineAdmin now respects can_delete=False. Backport of [12533] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 17:26:20 +00:00
Joseph Kocherhans 8c4f16657f [1.1.X] Fixed #12570. Removed unused fields from GenericForeignKey. Backport of r12492 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12495 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-22 22:14:31 +00:00
Jannis Leidel 77192eb661 [1.1.X] Fixed #12716 - Typo in the admin change list template. Thanks, kbrownlees.
Backport of r12398 and r12448.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-16 12:52:33 +00:00
Russell Keith-Magee 1d9bc59534 [1.1.X] 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.
Backport of r12420 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 12:32:49 +00:00
Justin Bronn da954e876b [1.1.X] Fixed #12664 -- Fixed `GenericRelation.m2m_reverse_name` to return the correct pk column name.
Backport of r12276 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-22 19:43:14 +00:00
Jannis Leidel d1e7fdea3f [1.1.X] Fixed #12017 - Overriding the default error message of the UKPostcodeField works again. Backport of r12044 and r12249.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:51:25 +00:00
Jannis Leidel abea4e6ee3 [1.1.X] Fixed #12013 - Marked some default error messages for translation.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:20:10 +00:00
Jannis Leidel 0216255632 [1.1.X] Fixed #10717 - Escape result of admin_media_prefix template tag.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:10:19 +00:00
Jannis Leidel 7b5b1c7ecd [1.1.X] Fixed #11478 - Use namespacing for URLs to i18n JavaScript in admin.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:09:59 +00:00
Jannis Leidel 4d409c0b3b [1.1.X] Fixed #12480 - Use month variable for headline text.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-17 22:09:07 +00:00
Luke Plant d4f9bff7ef [1.1.X] Fixed #12503 - form examples don't validate according to w3c
Thanks to skyl for the report.

Backport of r12086 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-04 22:22:16 +00:00
Justin Bronn 30c6021f80 [1.1.X] When `GEOSFree` is not available on NT platforms, have to specifically use the MS C library.
Backport of r12024 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12025 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-29 10:41:44 +00:00
Justin Bronn db867be91e [1.1.X] Fixed #12344 -- Using `select_related()` on geographic fields with the Oracle spatial backend now works.
Backport of r12022 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12023 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-29 10:35:59 +00:00
Luke Plant 58bf653a26 [1.1.X] Fixed #11191 - Admin throws 500 instead of 404 for PK of incorrect type
Thanks to mmachine for report and test, and Chris Beaven for the patch

Backport of r12011 from trunk



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-28 14:15:34 +00:00
Justin Bronn f1fe7c00e2 [1.1.X] Fixed #11609 -- The `check_pointer` error checking routine and `GDALBase._set_ptr` are now able to handle the long pointer addresses used by some x86_64 platforms. Thanks, rmkemker, for the bug report.
Backport of r12006 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-27 18:13:20 +00:00
Justin Bronn 90f7dfb461 [1.1.X] Fixed #12450 -- `GEOSFree` was really added in GEOS 3.1.1, not 3.1.0. Thanks, jpwatts for the bug report.
Backport or r12004 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-27 08:13:37 +00:00
Justin Bronn 94b718915d [1.1.X] Fixed #12438 -- now use `GEOSFree` to free string pointers allocated within GEOS when available; now parse out subminor version, and added a `GEOS_VERSION` tuple.
Backport of r11979 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11980 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-24 15:01:47 +00:00
Luke Plant b15d762d7a [1.1.X] Fixed #10927 - Content Types shortcut view throws 500s instead of 404s
Thanks to Jeremy Dunck/Alex Gaynor for the patch

Backport of r11917 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 15:31:28 +00:00
Jacob Kaplan-Moss 321fe61f64 [1.1.X] Fixed #11753 - Q objects with callables no longer explode on Python 2.4. Thanks, Jeremy Dunck.
Backport of [11901].

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 22:11:39 +00:00
Justin Bronn de2c7d9fdd [1.1.X] Fixed #12390 -- `Distance` and `Area` objects now support multiplication when they are the right-hand side.
Backport of r11898 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 18:29:05 +00:00
Russell Keith-Magee de64970091 [1.1.X] Updated BaseGenericInlineFormSet to match the changes made to BaseInlineFormSet in r11874.
Backport of r11885 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17 07:28:26 +00:00
Karen Tracey f4282336b3 [1.1.X] Fixed #12385: Made built-in field type descriptions in admindocs translatable again. Many thanks to Ramiro for the problem report and patch.
r11878 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 18:17:18 +00:00
Karen Tracey eef4739dee [1.1.X] Made the message strings added in r11838 visible to makemessages. Refs #12281.
r11864 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-14 16:05:28 +00:00
Karen Tracey fee560f4e5 [1.1.X] Fixed #10969: Made US State field a CharField, fixing a few oddities in its behavior. Thanks Paul McLanahan.
r11847 from trunk.



git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 22:08:03 +00:00
Karen Tracey 64736fe37f [1.1.X] Fixed #12146: Corrected Canadian postal code validation. Thanks paulschreiber and Mark Lavin.
r11844 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-13 17:05:17 +00:00
Karen Tracey 6c91e6ecbc [1.1.X] Fixed #12281: Added some helpful messages when Go is pressed in admin actions and there
is nothing to do because no action was selected or no items are selected. 

r11837 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 22:02:55 +00:00
Karen Tracey fa59129753 [1.1.X] Fixed #7977: Fixed admindocs to use docstrings instead of a static array to locate type information. Thanks J. Clifford Dyer.
r11833 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 20:36:31 +00:00
Karen Tracey 79d8d683d2 [1.1.X] Fixed #12349: Added missing unquote in admin history view. Thanks for the report guard.
r11808 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-10 20:01:59 +00:00
Justin Bronn 58c19c324b [1.1.X] Fixed #12340 -- `BaseGenericInlineFormSet.get_queryset` now returns an ordered queryset.
Backport of r11800 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-09 04:24:05 +00:00
Justin Bronn a9c816c41b [1.1.X] Fixed #12101 -- `OGRGeometry` does not need to create a clone of the `SpatialReference` object upon assignment.
Backport of r11707 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-03 06:18:52 +00:00
Justin Bronn 30ebd268be [1.1.X] Fixed #12093 -- `LayerMapping` now takes into account model inheritance when looking for the geometry column; forgot to diable extent regression test on MySQL.
Backport of r11703 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-02 02:24:01 +00:00
Luke Plant ebe5405282 Added a no-op {% csrf_token %} tag to 1.1.X, to ease transition of apps to 1.2
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 21:50:58 +00:00
Jacob Kaplan-Moss 1ab0b23df6 [1.1.X] Fixed #11057: having no actions in the admin (`actions=None`) no longer messes up the layout. Thanks, rvdrijst.
Backport of [11670] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-27 20:57:13 +00:00
Luke Plant 1f0266bd18 [1.1.X] Fixed #9163 - CsrfMiddleware needs to reset ETag header
Thanks to carljm for report and patch.

Backport of r11650 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-24 11:27:59 +00:00
Luke Plant 84dac3aa82 [1.1.X] Fixed #12067 - check_dependencies in contrib.admin.sites not triggered using new style admin include
Thanks to robhudson for report and patch.

Backport of r11648 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-24 10:17:25 +00:00
Brian Rosner b06d1be764 [1.1.X] Moved _get_foreign_key call after testing for fk_name fixing a broken test.
Backport of [11643] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-10-23 20:48:52 +00:00