mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-25 14:46:09 +00:00
Code Issues 32 Releases Wiki Activity
11,632 Commits 30 Branches 460 Tags
794fe19e196b98533ee539d35fd7ab7f688166b7
Commit Graph

123 Commits

Author SHA1 Message Date
Timo Graham
e4f468b940 Fixed #17749 - Documented better way of overriding ModelAdmin; thanks chrisdpratt and claudep. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-24 22:50:36 +00:00
Adrian Holovaty
7981efe04f Documentation (and some small source code) edits from [17432] - [17537] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17540 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-17 20:04:11 +00:00
Jannis Leidel
4dbeb4bca4 Fixed #17515 -- Added ability to override the template of custom admin FilterSpec classes. Thanks, saxix and Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17483 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-09 18:59:05 +00:00
Adrian Holovaty
103890561b Moved 'User-requested password resets' docs from [17266] from auth docs to admin docs 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-30 20:23:26 +00:00
Adrian Holovaty
804a38c369 Made some small clarifications to contrib/admin/index.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 20:46:10 +00:00
Aymeric Augustin
e42360b56b Added a versionadded directive for the 'admin_urlname' filter introduced at r16857. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-03 19:15:12 +00:00
Julien Phalip
9796f69533 Fixed #16257 -- Added new ModelAdmin.get_list_display_links() method to allow for the dynamic display of links on the admin changelist. Thanks to graveyboat for the suggestion and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17037 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-26 12:19:18 +00:00
Luke Plant
d1e5c55258 Fixed many more ReST indentation errors, somehow accidentally missed from [16955] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-14 00:12:01 +00:00
Julien Phalip
4da7c772ad Fixed #16776 -- Fixed a regression introduced in r16415 which caused Django's embedded jQuery to overwrite any pre-existing values of window.jQuery in the global namespace. Many thanks to Rob Hudson, Jannis Leidel and "anonymous" for the help resolving this issue. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-13 09:20:10 +00:00
Luke Plant
c61987d75a Removed use of non-standard indentation rules in docs, and the custom transform that supported them. 
Doc writers should be aware that we are now back to normal ReST rules
regarding blockquotes.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-10 17:32:33 +00:00
Luke Plant
af244e47cc Fixed a bunch of ReST errors that resulted in interpretation as block quotations 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-10 15:32:01 +00:00
Carl Meyer
b1b1da1eac Fixed #8060 - Added permissions-checking for admin inlines. Thanks p.patruno for report and Stephan Jaensch for work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 00:41:25 +00:00
Julien Phalip
c2b9f6496e Added some sphinx cross-reference links to the built-in template tags and filters in multiple areas of the documentation. Also fixed a few minor inconsistencies and did a little PEP8 cleanup while I was at it. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-03 08:06:01 +00:00
Jannis Leidel
2eadc418af Fixed doc references to django.db.models.query.QuerySet and converted some tabs that were introduced in r16699 to spaces. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16915 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-30 10:28:39 +00:00
Ramiro Morales
aaf77c1676 Converted internal link generation in the admin and admin document generator to use named URLs. 
Thanks to Florian Apolloner for both the initial patch and his final push to get
this fixed, to Dario Ocles for his great work on the admin templates and
switching the admin_doc application to also use named URLs, to Mikko Hellsing
for his comments and to Jannis and Julien for their review and design guidance.

Fixes #15294.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16857 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-20 18:30:06 +00:00
Carl Meyer
00678334aa Fixed #16863 -- Corrected ReST markup to avoid errors building docs. 
Although directives such as "note" and "warning" will accept content
immediately following the directive, this is technically where arguments to the
directive should go (see http://sphinx.pocoo.org/rest.html#directives). Putting
the content there means that any lines beginning with an inline text role
(e.g. ":setting:`DEBUG`") will be mis-interpreted as an option block for the
directive. To avoid this error, there should always be a blank line between the
directive start and the directive content.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-16 18:06:42 +00:00
Ramiro Morales
26b8122087 Fixed #14675 -- Completed removal of from django.conf.urls.default import * usage. 
This applies to both our own [test] code and documentation examples. Also:
 * Moved the functions and handlers from `django.conf.urls.defaults` up to
   `django.conf.urls` deprecating the former module.
 * Added documentation for `handler403`.
 * Tweaked the URLs topic document a bit.

Thanks to pupeno and cdestigter for their great work contributing patches.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 22:36:16 +00:00
James Bennett
7b92ae310d Fixed #16552: Noted that contrib.sessions is a requirement for the admin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16806 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-11 05:31:00 +00:00
Jannis Leidel
cf70c96ce0 Fixed #15997 -- Added list_max_show_all option to ModelAdmin in replacement for a global module level variable. Thanks, jsdalton. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-08 13:25:00 +00:00
Ramiro Morales
f4d93f6eb8 Two very simple docs fixes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-03 17:46:16 +00:00
Jannis Leidel
566b3295fa Fixed #16621 -- Fixed lots of typos in the docs. Thanks, Bernhard Essl. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-13 11:58:19 +00:00
Jannis Leidel
3d027b72eb Fixed #14496 -- Fixed conflict between ModelForm exclude and ModelAdmin readonly values. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16602 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-08-12 14:14:49 +00:00
Jannis Leidel
94f7481396 Fixed #16377 -- Fixed docs about how to disable the admin actions conditionally to match the current code. Thanks, Aymeric Augustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-29 09:40:43 +00:00
Jannis Leidel
332a485567 Fixed #16115 -- Added ModelAdmin.save_related method to be able to do pre- or post-save operations for objects related to the parent object currently displayed. Thanks, Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-03 17:56:43 +00:00
Jannis Leidel
d138906ad9 Fixed #15974 -- Correctly link to static files handling in deployment docs. Thanks, RogueBean. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-01 15:18:42 +00:00
Jannis Leidel
f749bb829c Fixed #12875 -- Added get_ordering to ModelAdmin. Many thanks to Manuel Saelices. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16383 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-12 13:04:53 +00:00
Jannis Leidel
5dc7be2192 Fixed #16195 -- Added docs for ModelAdmin's get_changelist method. Thanks, msaelices. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16370 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-11 15:43:51 +00:00
Luke Plant
207e3ed9d5 Fixed #14206 - dynamic list_display support in admin 
Thanks to gabejackson for the suggestion, and to cyrus for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-08 22:53:55 +00:00
Luke Plant
5434ce231d Fixed #11868 - Multiple sort in admin changelist. 
Many thanks to bendavis78 for the initial patch, and for input from others.

Also fixed #7309. If people were relying on the undocumented default ordering
applied by the admin before, they will need to add 'ordering = ["-pk"]' to
their ModelAdmin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16316 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-02 16:18:47 +00:00
Jannis Leidel
49f57a5d28 Fixed #15992 -- Added more references to settings. Thanks, aaugustin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-29 17:41:04 +00:00
Ramiro Morales
2b5730873b Added ability to describe grouping of form fields in the same row to the fields ModelAdmin attribute. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-14 16:29:39 +00:00
Jannis Leidel
95dc7c7486 Fixed #15960 -- Extended list filer API added in r16144 slightly to pass the current model admin to the SimpleListFilter.lookups method to support finer grained control over what is filtered over. Many thanks to Carl Meyer and Julien Phalip for the suggestion and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16152 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-04 22:52:04 +00:00
Jannis Leidel
05b4f2ebc2 Corrected the behavior of the SimpleFilter.lookups method to also be able to return None. Also modified example in documentation to be a bite more realistic. Refs #5833. Thanks for the hint, Martin Mahner. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-03 13:52:39 +00:00
Jannis Leidel
18d2f4a816 Fixed #5833 -- Modified the admin list filters to be easier to customize. Many thanks to Honza Král, Tom X. Tobin, gerdemb, eandre, sciyoshi, bendavis78 and Julien Phalip for working on this. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-03 10:44:23 +00:00
Jannis Leidel
c8092b840b Fixed #15008 -- Replaced all calls in the admin to render_to_response with TemplateResponses for easier customization. Thanks to Chris Adams for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16087 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-22 18:17:16 +00:00
Jannis Leidel
6c17190bf8 Fixed #11639, #13618 -- Added get_prepopulated_fields method to ModelAdmin and InlineModelAdmin to be able to handle prepopulated fields on a case-by-case basis. Thanks, leanmeandonothingmachine. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-22 12:02:25 +00:00
Luke Plant
8d4b414760 Fixed #15757 - removed remaining instances of get_and_delete_messages 
Thanks to void for the report, and julien for the bulk of the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-07 22:01:23 +00:00
Simon Meers
e301899392 Fixed #15746. Clarified updated list_filter documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16010 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-03 23:08:48 +00:00
Luke Plant
fdf9602961 Fixed #11058 - list_display_links doesn't allow callables not defined in the model 
Thanks to dvine for the report and julien for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-21 19:15:02 +00:00
Gabriel Hurley
319de16ff0 Fixed #15233 -- reST/Sphinx markup corrections in numerous areas, mostly centering around bad crossref targets. Thanks to Aryeh Leib Taurog for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15549 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-16 01:56:53 +00:00
Ramiro Morales
d7c2dcd538 Fixed a couple of documentation typos. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-14 15:02:02 +00:00
Timo Graham
f77d81de3d Fixed #15208 - Document ModelAdmin.formfield_for_choice_field; thanks julien. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15399 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-02 20:57:09 +00:00
Timo Graham
fe0a15b6c9 Fixed #14993 - Improved docs for ModelAdmin.filter_horizontal adding that it's for ManyToManyFields; thanks jammon for the suggestion. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-29 02:01:43 +00:00
Timo Graham
4d654c92ce Fixed #15030 - ModelAdmin media docs don't mention STATIC_URL. Thanks jezdez for the suggestion, Silva for the draft patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15225 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-16 13:56:12 +00:00
Timo Graham
30c8a5574a Fixed #15003 - assorted edits to admin docs; thanks adamv. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15166 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-08 21:15:00 +00:00
Ramiro Morales
70c8cd4100 Fixed #13307 -- Enhanced the generic inlines documentation by mentioning the concrete Generic{Tabular,Stacked}Inline classes that should be used. Thanks loki77 for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15124 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-31 23:02:07 +00:00
Timo Graham
7902a89ced Fixed #12469 - Add a few clarifications to the ModelAdmin.get_urls() docs. Thanks benc for the suggestions. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-29 21:50:40 +00:00
Timo Graham
ddfe700563 Fixed #12642 - Add docs for has_[add|change|delete]_permission ModelAdmin methods. Thanks to MadeR for the report and for the wiki contributors from which I took language for this patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15066 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-27 13:41:19 +00:00
Timo Graham
2ea93f9327 Fixed #14000 - remove versionadded/changed tags for Django 1.0 and 1.1 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-26 00:37:14 +00:00
Jannis Leidel
af5ad1116c Rectified bugs that were accidentally committed in r14997. Thanks for the heads-up, Alex Gaynor. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-21 19:19:04 +00:00