1
0
mirror of https://github.com/django/django.git synced 2024-12-25 02:26:12 +00:00
Commit Graph

6466 Commits

Author SHA1 Message Date
Luke Plant
a754165a91 Fixed #9637: Use 'block.super' in admin 'extrastyle' blocks to preserve changes in base_site.html
The current admin templates do not need this.  However, a common way to customize admin
appearance is to provide your own 'base_site.html' template, and add stylesheets using
the extrastyle block.  Without this patch, these customizations are lost.



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


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-16 17:42:18 +00:00
Karen Tracey
10894da8a8 Fixed #9859 -- Added another missing force_unicode needed in admin when running on Python 2.3. Many thanks for report & patch to nfg.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9656 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-16 15:04:47 +00:00
Karen Tracey
5f78eff909 Fixed #9814 -- Allowed SafeStrings to be saved to sqlite DB when running on Python 2.6.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-16 14:28:22 +00:00
Malcolm Tredinnick
b58a260c56 Fixed #9431 -- Added extra validation for VARCHAR-based fields on MySQL.
max_length > 255 and unique=True is not permitted. Based on a patch from
adamnelson.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-16 06:43:18 +00:00
Malcolm Tredinnick
fddc0c589e Removed one test that is only intended for PostgreSQL from the visibility of
other databases. This basically hides an annoying warning when running the
tests under MySQL.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-16 06:42:19 +00:00
Malcolm Tredinnick
b96b450981 Fixed #9786 -- Fixed inequality checking for django.db.models.fields.file.FieldFile class.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-16 04:52:55 +00:00
Karen Tracey
4bede45816 Remove some code in loaddata that bails out of searching for fixture files (only when verbosity > 1) as soon as attempting to open any potential fixture file fails. This code looks to have been mistakenly added in r9527; loaddata ought to proceed with attempting to locate other fixture files, regardless of verbosity setting, as it did before r9527.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-14 19:31:26 +00:00
Matt Boersma
5257fd2225 Reformatted PL/SQL flush left so "manage.py sqlall [app] | manage.py dbshell" works with Oracle. Also some PEP8 cleanup.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-11 20:12:00 +00:00
Malcolm Tredinnick
f1f1d366c8 Removed django.db.models.options.Options.one_to_one_field.
The last use of it was removed in r9641 (it's internal API) and it's been
broken since r7477, as there's no longer a maximum of one OneToOneField per
model, so anything relying on it contained subtle bugs.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-11 07:31:41 +00:00
James Bennett
bb6d5dc69b Fixed #9795: Since related-object selection widgets take limit_choices_to into account, the offending code is no longer necessary and can simply be removed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-11 07:06:25 +00:00
Malcolm Tredinnick
a1cbeb9afb If an SQL query doesn't specify any ordering, avoid the implicit sort
that happens with MySQL when a "GROUP BY" clause is included. This is a
backend-specific operation, so any other databases requiring similar
encouragement can have a function added to their own backend code.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-10 05:19:27 +00:00
James Bennett
7030ab9a72 Yet another place where we claim to support 2.3 and up
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-10 01:52:08 +00:00
James Bennett
280236eacd Another place where we talked about Python versions.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 23:05:55 +00:00
James Bennett
626f72733d Clarify install docs to point at new FAQ items about Python 3.0.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 22:48:23 +00:00
James Bennett
adfad3c193 Fixed #9783; clarified install docs and FAQ to explain that Django does not yet work with Python 3.0.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 22:39:58 +00:00
Malcolm Tredinnick
b4364e099e Documented how to handle '%' characters in redirect_to() URL strings (even in
the absence of keyword arguments). Fixed #9773.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 07:33:08 +00:00
Malcolm Tredinnick
80da07e4b9 The "permanent" parameter to redirect_to (r9594) is new in Django 1.1. Noted as
much in the docs.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 07:32:28 +00:00
Malcolm Tredinnick
731f6be262 Fixed #9777 -- Typo fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 07:15:35 +00:00
Malcolm Tredinnick
d29b7a14c5 Fixed #9772 -- Fixed a couple of broken links and pointed them to a more
appropriate section. Thanks, Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 07:13:49 +00:00
Malcolm Tredinnick
5570b0766d Fixed #9778 -- Added some special casing of the "Join on field 'abc'" error
message. It now gives an extra hint if there's a chance you just made a typo in
the lookup type.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 07:03:52 +00:00
Malcolm Tredinnick
5e9c5de78a Fixed #9775 -- Fixed an oversight from r9601 and allow direct attribute
lookup in the serializable_value() method. This means that abstract
parents that are multi-table children of other models(no, really!!) now
work again.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 06:49:40 +00:00
Adrian Holovaty
c006ef5746 Did some much-needed rewriting/editing in the formsets section of docs/topics/forms/modelsforms.txt. 'It self' is not two words.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 04:17:14 +00:00
Brian Rosner
6553ddc5b4 Improved the model formset and inline formset documentation to be more explicit and handle some cases that were never addressed before.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-09 00:31:17 +00:00
Matt Boersma
15bd649940 Fixed obscure Oracle quoting issues pointed out by the custom_columns_regress test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 18:36:22 +00:00
Karen Tracey
453d452653 In the release process doc, clarify that the original committer is responsible for backporting trunk fixes to the bug-fix branch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 17:15:56 +00:00
Justin Bronn
bde736cc5a Fixed a Python 2.4 incompatibility in compress_kml.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 14:50:06 +00:00
Justin Bronn
6590c0bcf5 Fixed #9747 -- now explicitly set response type on C functions that return WKB and WKT.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 14:29:06 +00:00
Malcolm Tredinnick
662e12b45c The second part of fixing "related inherited models" display. Handle raw_id values for child models in the admin. Fixed #9461.
I couldn't think of a way to test this automatically and robustly, however,
manual testing with the ticket example shows failure before and success
afterwards and the fix make sense logically.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 08:16:26 +00:00
Malcolm Tredinnick
d662ef5540 The first step in fixing a group of problems related to outputting a proper
"value" for a field that is a relation to another model.

This part adds the utility method on Model that should help in general.Also
cleans up the slightly ugly mess from r8957.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 08:15:37 +00:00
Gary Wilson Jr
fa7aa7255c Fixed #9732 -- Added missing close paragraph tag to password reset confirmation template, thanks casseen.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9599 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 05:41:28 +00:00
Gary Wilson Jr
235600c3c3 Fixed #9724 -- Added missing import to URLconf example, thanks shacker.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 05:35:20 +00:00
Gary Wilson Jr
ff3e1a7d40 Fixed #9718 -- Removed a reference to oldforms FormWrapper object in the user authentication docs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 05:27:04 +00:00
Adrian Holovaty
b76d7c1dec Added a 'permanent' argument the simple.redirect_to() generic view. It's True by default, to match existing behavior. If set to False, the redirect will be a 302 instead of a 301. This is technically backwards-incompatible if you were using the redirect_to generic view with a format-string key called 'permanent', which is highly, highly unlikely.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-12-08 04:53:34 +00:00