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

29 Commits

Author SHA1 Message Date
Jacob Kaplan-Moss
11d08bca2b [1.0.X] Fixed #10448: correcting errors on "save as new" now correctly create a new object instead of modifying the old one. Thanks, bastih. Backport of [10713] from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-13 18:41:39 +00:00
Russell Keith-Magee
0d930ee0e6 [1.0.X] Fixed #11042 -- Corrected admin inlines for inherited models. Thanks to jsmullyan for the report, and mir for helpful triage work. Patch includes regression test for #8093, and a commented out test for #10992. 
Merge of r10725 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-09 11:52:15 +00:00
Russell Keith-Magee
8397c1fdfa [1.0.X] Fixed #10899 -- Ensured that log messages for deletions in the admin contain useful descriptions. Thanks to Jeremy Dunck for the patch. 
Merge of r10686 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 16:12:51 +00:00
Russell Keith-Magee
41ba8e7ca6 [1.0.X] Fixed #10516 -- Corrected admin search when the search_fields definition contains multiple fields on the same base model. Thanks to Zain Memon 
Merge of r10684 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 16:08:55 +00:00
Russell Keith-Magee
6541739765 [1.0.X] Fixed #10275 -- Corrected the edge case of rendering a LogEntry with a contenttype of None. Thanks to Jarek Zgoda for the report, and Peter Bengtsson for the patch 
Merge of r10675 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10676 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-05 12:46:50 +00:00
Karen Tracey
7ff22ef258 [1.0.X] Fixed #9651: fixed save_as with inline forms. Thanks, kmike and Mnewman. 
Backport of r10353 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-21 18:58:32 +00:00
Jacob Kaplan-Moss
283442a50e [1.0.X] Fixed #10002: inline file uploads now correctly display prior data. Thanks, dgouldin. Backport of r10588 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-18 20:34:42 +00:00
Jacob Kaplan-Moss
eb24c7fd0c [1.0.X] Fixed #9969: choices with options groups (added in [7977]) now work correctly in the admin with list_display and list_filter. Thanks, ramiro. Backport of r10318 from trunk; thanks, cramm. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10340 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 21:17:54 +00:00
Jacob Kaplan-Moss
906f55bf09 [1.0.X] Fixed #7510: the ModelAdmin now uses self.queryset instead of the default manager. Thanks, Alex Gaynor. Backport of r10314 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10320 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-01 15:07:13 +00:00
Joseph Kocherhans
00087ef006 [1.0.X] Fixed #9863. A ForeignKey with editable=False to the parent in an inline no longer raises an exception. Thanks to keithb for the test case and Alex Gaynor for the patch. Backport of r10239 from trunk. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-31 20:39:54 +00:00
Russell Keith-Magee
ee0320f634 [1.0.X] Fixed #10271, #10281 -- Fixed the handling multiple inline models that share a common base class and have the link to the inline parent on the base class. Includes modifications that allow the equivalent handling for GenericFields. Thanks to Idan Gazit, Antti Kaihola (akaihola), and Alex Gaynor for their work on this patch. 
Backport of r10017 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-10 12:08:17 +00:00
Karen Tracey
ae5c9b33d0 [1.0.X] Fixed #9859 -- Added another missing force_unicode needed in admin when running on Python 2.3. Many thanks for report & patch with test to nfg. 
Also enhanced the new test to hopefully exercise all paths through the get_deleted_objects function, and fixed the errors pointed out by the beefed-up test.

r9656 and r9657 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9658 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-16 17:53:33 +00:00
Karen Tracey
4a3dcd7f5e [1.0.X] Fixed #8910 -- Added force_unicode during admin log message creation to avoid triggering a Python 2.3 bug. Thanks for the report joshg and patch nfg. 
[9383] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-10 17:26:13 +00:00
Karen Tracey
3ced836c73 [1.0.X] Fixed #9514 -- Made admin change_form template correctly recognize/report when a form has only a single error. 
[9371] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-11-09 18:54:12 +00:00
Karen Tracey
bffc238a2f [1.0.X] Fixed #7179 -- Changed breadcrumbs on the add page so that a link to the change view is not included when the user doesn't have permission for that view. Also added tests to ensure the link is not there when it shouldn't be, and there when it should be. Thanks for the report & patch alen__ribic. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-24 19:18:10 +00:00
Karen Tracey
74997f95de [1.0.X] Fixed #9252 -- Moved the try/except protecting against incorrect lookup params to where the error is now raised, and added a test for this case. 
Backport of [9245] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9246 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-22 23:14:48 +00:00
Karen Tracey
118383c607 [1.0.X] Fixed #3096 -- Make admin list_filters respect limit_choices_to. 
Backport of [9241] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9242 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-21 19:06:44 +00:00
Karen Tracey
9810648bef [1.0.X] Fixed #9053 -- Allowed for sorting of callable and ModelAdmin methods specified in list_display (added in r8352). Previously attempting to sort on the former would raise an exception and the latter simply didn't sort. Also added tests for this function. Thanks rgl and jenan. 
Backport of [9211], also updated svnmerge.py metatdata.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9212 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-08 14:57:34 +00:00
Jacob Kaplan-Moss
0e5faf225c Security fix. Announcement forthcoming. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-02 21:10:00 +00:00
Brian Rosner
cd0b65bcf7 Fixed #7982 -- Corrected ModelAdmin url dispatching to ensure it matching exactly what it needs and doesn't stomp on primary key space. 'add' is a lost cause for now. This originated from #6470. Thanks jdetaeye for the original patch and basith for providing test cases. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8704 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:46:46 +00:00
Jacob Kaplan-Moss
21928f2ba0 Fixed #7738: support initial values via GET for SelectMutliple in the admin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-29 16:09:29 +00:00
Russell Keith-Magee
27b0077a48 Fixed #8509: Cleaned up handling of test cookies in admin logins. Thanks to rajeshd for the report of a problem case. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-24 06:34:18 +00:00
Russell Keith-Magee
a9ee1d4e28 Fixed #7776: Ensured that the test cookie is always deleted once a login has succeeded. Thanks for the report and fix, Mnewman. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8484 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-23 14:12:58 +00:00
Malcolm Tredinnick
4881a4ffb0 Use failIf() instead of assertFalse() so that tests work with python 2.3. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8379 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-15 14:58:47 +00:00
Brian Rosner
65be56816f Fixed #5780 -- Adjusted the ModelAdmin API to allow the created/updated objects 
to be passed to the formsets prior to validation.

This is a backward incompatible change for anyone overridding save_add or
save_change. They have been removed in favor of more granular methods
introduced in [8266] and the new response_add and response_change nethods.
save_model has been renamed to save_form due to its slightly changed behavior.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 20:52:40 +00:00
Jacob Kaplan-Moss
4747347385 Fixed #5801: admin requests with GET args now get properly bounced through login with those args intact. Thanks for the patch, Rozza. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-09 17:35:19 +00:00
Malcolm Tredinnick
ab8965c428 Added a few force_unicode() calls around objects in the admin. Required for 
Python 2.3 compatibility. Patch from nfg.

Refs #8151, #8153.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8236 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-08 18:07:33 +00:00
Malcolm Tredinnick
c5a76a3669 Fixed a bunch of Python 2.3 test failures. 
All remaining buildbot failures on 2.3 are not due to the test suite, as far as
I can work out.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-22 19:48:36 +00:00
Brian Rosner
a19ed8aea3 Merged the newforms-admin branch into trunk. 
This is a backward incompatible change. The admin contrib app has been
refactored. The newforms module has several improvements including FormSets
and Media definitions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 23:54:34 +00:00