Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity
9,362 Commits 26 Branches 382 Tags
Commit Graph

107 Commits

Author SHA1 Message Date
Russell Keith-Magee
120d01c20b [1.2.X] 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. 
Backport of r15657 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-26 12:49:15 +00:00
Jacob Kaplan-Moss
062cbfb1ec [1.2.X] 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.

Backport of [15639] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-24 13:38:32 +00:00
Ramiro Morales
fa1a74ff3c [1.2.X] 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. 
Backport of [15637] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-24 01:09:23 +00:00
Ramiro Morales
1d1f3632c6 [1.2.X] 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. 
Backport of [15596] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15597 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-20 23:19:21 +00:00
Russell Keith-Magee
626ad2c9ab [1.2.X] 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. 
Backport of r15584 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-19 14:30:23 +00:00
Russell Keith-Magee
909ee62563 [1.2.X] 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. 
Backport of r15582 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15583 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-19 12:56:25 +00:00
Russell Keith-Magee
da4dea5834 [1.2.X] 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. 
Backport of r15580 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15581 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-19 11:52:33 +00:00
Russell Keith-Magee
fdd3bd9d15 [1.2.X] Ensure that L10N formats aren't cached between tests. 
Backport of r15461 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15463 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-09 00:11:57 +00:00
Russell Keith-Magee
c058dfa9cd Corrected merge failure from r15455. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15462 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-09 00:11:09 +00:00
Russell Keith-Magee
27e7fcbab0 [1.2.X] 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. 
Backport of r15452 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15456 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-08 12:23:23 +00:00
Russell Keith-Magee
09a820550b [1.2.X] 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. 
Backport of r15451 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15455 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-08 12:23:03 +00:00
Russell Keith-Magee
bb46b44ec9 [1.2.X] 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. 
Backport of r15404 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-04 13:53:44 +00:00
Luke Plant
b3ad41bfd5 [1.2.X] Fixed #14880 - raw_id_fields in admin does not work when limit_choices_to dictionary has value=False 
Thanks to smallming for the report.

Backport of [15348] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-28 15:36:41 +00:00
Luke Plant
276ecc7209 [1.2.X] 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.

Backport of [15347] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15349 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-28 14:59:54 +00:00
Ramiro Morales
3297c09da4 [1.2.X] 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 to django.utils.html so it can be used from Python code. Thanks andrewwatts for the patch. 
Backport of [15131] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15191 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-13 15:47:36 +00:00
Ramiro Morales
90be6ca20d [1.2.X] Fixed #15032 -- Replaced 1.2.X implementation of admin changelist filtering security fix (r15031/r15033) with the one from trunk so another valid filter usage scenario (using model inheritance) is still possible. Thanks rene for reporting this. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-12 23:25:33 +00:00
Russell Keith-Magee
c76ab45fc6 [1.2.X] Fixed #14999 -- Ensure that filters on local fields are allowed, and aren't caught as a security problem. Thanks to medhat for the report. 
Backport of r15139 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15140 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-03 14:01:44 +00:00
Alex Gaynor
85207a245b Fix a security issue in the admin. Disclosure and new release forthcoming. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-23 03:46:16 +00:00
Alex Gaynor
cc48f66f73 [1.2.X] Removed all usages of deprecated TestCase methods (self.fail*). This removed most of the Warnings emitted (with -Wall) during the test suite. Backport of [14803]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-04 07:49:31 +00:00
Jannis Leidel
a607d9d345 [1.2.X] Fixed #8342 -- Removed code from the admin that assumed that you can't login with an email address (nixed by r12634). 
Backport from trunk (r14769).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-02 01:02:11 +00:00
Ramiro Morales
237e9557d7 [1.2.X] 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.

Backport of [14628] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14629 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-19 23:04:48 +00:00
Ramiro Morales
4d70df8b78 [1.2.X] 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.

Backport of [14104] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14105 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-10 01:59:17 +00:00
Karen Tracey
6bc74f06e2 [1.2.X] Fix AdminDocsTest failure on 1.2.X branch by correcting the test to reference an app tag that actually exists in 1.2.X. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-12 18:14:45 +00:00
Malcolm Tredinnick
f4ebd701f2 [1.2.X] Adjust AdminDocTests to run after r13728. Also match comments to tests and add test that was there in comment form only.Refs #3695. 
Backport of r13737 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13750 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-11 17:55:08 +00:00
Luke Plant
a04398eb1b [1.2.X] Fixed #13081 - Admin actions lose get-parameters in changelist view 
Thanks to joh for report and to SmileyChris for patch.

Backport of [13696] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-07 20:59:28 +00:00
Russell Keith-Magee
c9016c15a9 [1.2.X] 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. 
Backport of r13606 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-19 13:12:52 +00:00
Russell Keith-Magee
13953badb7 [1.2.X] Fixed #13796 -- Ensure that builtin tags and filters are included in admin documentation views. 
Backport of r13588 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-14 13:43:13 +00:00
Russell Keith-Magee
c543f079ff [1.2.X] Fixed #14014 -- Ensure that the "save and add another" button for users actually does what it says. Thanks to Ramiro for the report. 
Backport of r13503 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-06 16:09:28 +00:00
Russell Keith-Magee
7930d8c477 [1.2.X] 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. 
Backport of r13051 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-08-06 14:59:13 +00:00
Russell Keith-Magee
21e84194b5 Fixed #13514 -- Corrected the process of loading multiple javascript translation catalogs. Thanks to jtiai for the report, to Ramiro Morales for working out the test case, and to Ramiro and Jannis for their help on the fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-13 13:29:31 +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
Jannis Leidel
43bf086783 Fixed #13388 - Refined changes made in r12384 in the JavaScript i18n admin view. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13069 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-02 19:46:31 +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
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
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
f4c76fb604 Fixed #13298 -- Modified test assertion to ensure that javascript variables aren't mistakenly identified as <input> HTML tags. Thanks to mk for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-11 06:58:33 +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
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
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
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
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
James Bennett
3b7545f3f8 Clean up a stray debugging print from [12746]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12747 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-10 08:40:45 +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
Jannis Leidel
647651698f Fixed test of the admin actions selection counter for changes made in r12626. Thanks for the report, Eric Holscher. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-01 18:58:54 +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
Joseph Kocherhans
ea3853e8d2 Fixed #12878. Formset-wide errors are now rendered properly as html. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-23 20:55:42 +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
Jannis Leidel
342517000c Added missing tests for fix committed in r12398. Thanks Karen for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12448 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-16 12:17:37 +00:00
Jannis Leidel
9555f2be9d Fixed #12692 - Properly handle the extra clause of admin inline formsets. Also fixes #12703, second error. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12369 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-02-01 14:14:56 +00:00
Russell Keith-Magee
65b6080da2 Fixed #12703 -- Corrected a test suite failure in the admin_views tests. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12308 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-27 14:18:50 +00:00