mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 12:05:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
10425 commits 30 branches 460 tags 721 MiB
Commit graph

130 commits

Author SHA1 Message Date
Luke Plant
cb996cce05 Fixed various bugs related to having multiple columns in admin list_display with the same sort field 
Thanks to julien for the report

Refs #11868

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-03 11:54:29 +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
Luke Plant
65cc646c48 Removed a broken test added in [16312] 
This test caused a test failure (in subclass CustomModelAdminTest), and the
test also proved to be extremely brittle when trying to implement #11868,
and basically unfixable with current infrastructure.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-02 00:24:37 +00:00
Luke Plant
2304ca4236 Fixed bug with __str__ headers in admin changelist have a non-functioning sort URL 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16312 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-06-01 23:17:40 +00:00
Jannis Leidel
b0d274dbd5 Added missing future imports missed in r16167. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16169 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-06 19:49:06 +00:00
Jannis Leidel
7dd72360a2 Make use of new translation and settings context manager in the tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16167 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-06 13:29:44 +00:00
Luke Plant
8eccb728cc Fixed #15964 - Do not order admin actions by description 
Thanks to julien for the report and patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-05 22:03:17 +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
Adrian Holovaty
94af19c43f Changed e-mail to email throughout documentation and codebase. The one exception is translation strings, which I didn't want to disrupt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-01 16:10:22 +00:00
Ian Kelly
9e637d3061 Fixed a number of tests that were failing in Oracle due to false assumptions about the primary keys of objects. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-09 00:39:35 +00:00
Russell Keith-Magee
afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 15:04:39 +00:00
Jannis Leidel
b921f1bac0 Fixed #12475 -- Fixed an edge case with hidden fields in ModelAdmin changelists when used in conjunction with list_display_links or list_editable. Thanks, Simon Meers, Julien Phalip, Karen and master. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 13:20:45 +00:00
Ramiro Morales
bd3b5e8c2b Fixed #15517 -- Fixed regression in admin search_fields option introduced in r15526. Thanks Fabian Buechler for the report and fix and Julien Phalip for adding tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-01 02:04:35 +00:00
Russell Keith-Magee
b5b5ba6cd9 Fixed #10918 -- Ensure that the search widget on a raw_id_admin uses the right field name when the ForeignKey has a to_field definition. Thanks to David Cramer for the report, Collin Anderson for the fix, and Julien Phalip for the test. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15657 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-26 12:44:25 +00:00
Jacob Kaplan-Moss
174d8db57c Prevented non-admin users from accessing the admin redirect shortcut. 
If the admin shortcut view (e.g. /admin/r/<content-type>/<pk>/) is
publically-accessible, and if a public users can guess a content-type ID
(which isn't hard given that they're sequential), then the redirect view could
possibly leak data by redirecting to pages a user shouldn't "know about." So
the redirect view needs the same protection as the rest of the admin site.

Thanks to Jason Royes for pointing this out.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-24 13:34:51 +00:00
Ramiro Morales
4b13e76deb Fixed #14012 (again) -- Admin app: Don't show the full user edition view after adding a user in a FK popup. Thanks dburke for reporting this regression introduced in r14628. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-24 01:00:57 +00:00
Ramiro Morales
52fc61e0cf Fixed #14529 -- Fixed representation of model names in admin messages after model object changes when the ModelAdmin queryset() uses defer() or only(). Thanks rlaager for report and initial patch, to rasca an julien for help in tracking the problem. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-20 23:09:25 +00:00
Russell Keith-Magee
75a1aaa1f9 Fixed #11513 -- Ensure that the redirect at the end of an object change won't redirect to a page for which the user doesn't have permission. Thanks to rlaager for the report and draft patch, and to Julien Phalip for the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-19 14:05:07 +00:00
Russell Keith-Magee
fe3c9ad551 Fixed #14355 -- Ensure that help_text is displayed for readonly fields in the admin. Thanks to jester for the report, and to alexbmeng, subsume, wamberg and Julien Phalip for ther work on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-19 12:55:09 +00:00
Russell Keith-Magee
791ecb4be4 Fixed #13126 -- Ensured that individual form errors are displayed when errors occur on a list-editable changelist. Thanks to slafs for the report, and to Julien Phalip for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-19 11:48:42 +00:00
Ramiro Morales
d5042109b8 Corrected small error when preserving an I18N-related setting value in an admin views test setup. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-16 03:30:27 +00:00
Russell Keith-Magee
c2666c9a45 Ensure that L10N formats aren't cached between tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15461 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-09 00:09:54 +00:00
Russell Keith-Magee
4e7c2ba1d7 Cleaned up the tests from r15451 to avoid the need to retrieve a URL twice. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15453 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-08 12:20:18 +00:00
Russell Keith-Magee
74ffca17e2 Fixed #10573 -- Corrected autofocus problem in admin when the first widget displayed is a multiwidget. Thanks to rduffield for the report, and to Ramiro and Julien Phalip for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-08 12:00:21 +00:00
Russell Keith-Magee
a105ca5d7a Fixed #15234 -- Ensure that years in a date heirarchy don't use commas for thousand separators, regardless of the value of USE_THOUSAND_SEPARATOR. Thanks to Julien Phalip for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-08 12:00:01 +00:00
Russell Keith-Magee
5582ad149c Fixed #14895 -- Ensure that USE_THOUSAND_SEPARATOR doesn't break the delete confirmation page. Thanks to Tuttle for the report, and Julien Phalip for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-06 06:16:03 +00:00
Russell Keith-Magee
d44fb0557a Fixed #14824 -- Corrected the handling of formats when USE_L10N is disabled. Thanks to nullie for the report and initial patch, and to idle for the separate report with helpful debug info. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-04 13:52:36 +00:00
Luke Plant
655d5afea9 Fixed #14880 - raw_id_fields in admin does not work when limit_choices_to dictionary has value=False 
Thanks to smallming for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15348 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-28 14:08:42 +00:00
Luke Plant
c24bdf044b Fixed #15103 - SuspiciousOperation with limit_choices_to and raw_id_fields 
Thanks to natrius for the report.

This patch also fixes some unicode bugs in affected code.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-28 14:08:25 +00:00
Carl Meyer
53dac996ef Poured a little more perfectionism into the delete-confirmation templates. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-20 01:00:47 +00:00
Carl Meyer
93a4d46184 Fixed #14672 - Added admin handling for on_delete=PROTECT. Thanks to jtiai for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15249 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-20 00:33:32 +00:00
Ramiro Morales
1c56af676d Added tests demonstrating that filtering lookup expression that involve model with inheritance schemes aren't incorrectly blacklisted by the r15031 security fix. Refs. #15032. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-12 23:30:47 +00:00
Russell Keith-Magee
6bd8c14be9 Fixed #14999 -- Ensure that filters on local fields are allowed, and aren't caught as a security problem. Thanks to medhat for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-03 13:56:31 +00:00
Ramiro Morales
0f783b7f4e Fixed #2986 -- Made the JavaScript code that drives related model instance addition in a popup window handle a model representation containing new lines. Also, moved the escapejs functionality yoo django.utils.html so it can be used from Python code. Thanks andrewwatts for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-02 17:34:52 +00:00
Jannis Leidel
7a89d3d503 Fixed #11700 -- Stopped admin actions and list_editable fields to show up in popups. Thanks to Simon Meers for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-02 01:32:40 +00:00
Alex Gaynor
732198ed5c Fix a security issue in the admin. Disclosure and new release forthcoming. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15031 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-23 03:44:38 +00:00
Jannis Leidel
2c2209b473 Fixed #13607 -- Auto-initialize admin's date hierarchy links intelligently. Thanks, Simon Meers. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-12 22:54:50 +00:00
Alex Gaynor
5bc0ec4ec4 Removed all usages of deprecated TestCase methods (self.fail*). This removed most of the Warnings emitted (with -Wall) during the test suite. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14803 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-04 07:28:12 +00:00
Jannis Leidel
cc64fb5c4b Fixed #8342 -- Removed code from the admin that assumed that you can't login with an email address (nixed by r12634). Also refactored login code slightly to be DRY by using more of auth app's forms and views. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-02 00:44:35 +00:00
Honza Král
dc334a2ba8 Fixed #3400 -- Support for lookup separator with list_filter admin option. Thanks to DrMeers and vitek_pliska for the patch! 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-21 19:29:15 +00:00
Alex Gaynor
274aba3b9b Fixed #11108 -- added ModelAdmin.delete_model, a hook with which to perform custom pre-post delete behavior. Thanks to Florian Apolloner for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-21 19:00:40 +00:00
Ramiro Morales
0e26f58dae Corrected change in behavior regarding the page shown after the 'Save' button is pressed when adding a user through the admin. 
It had been introduced in trunk (r13503) and between 1.2.1 and 1.2.2 (r13504). The original fix intended to correct a similar problem introduced between 1.1 and 1.2 (r12218) this time in the 'Save and add another' button.
We have now tests for the three buttons present in the Add User admin form to avoid future regressions.
Thanks to Juan Pedro Fisanotti and Cesar H. Roldan for their work.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 22:45:51 +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
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
Karen Tracey
506d559876 Adjust AdminDocTests to run after r13728. Also match comments to tests and add test that was there in comment form only.Refs #3695. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 00:02:33 +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
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
Russell Keith-Magee
a352154e42 Fixed #14123 -- Made AdminDocs tests optional, based on the availability of docutils. Thanks to PaulM for the original report, and Łukasz Rekucki for narrowing down the cause. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-19 13: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