Brian Rosner
c49eac7d4f
Fixed #8069 -- Corrected the inconsistent case with BaseInlineFormset. It has been renamed to BaseInlineFormSet. Backward incompatible for anyone who used BaseInlineFormset directly.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8243 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-08 20:27:48 +00:00
Brian Rosner
5d199ba901
Fixed #8163 -- Restore oldforms admin styling on input fields. Also cleaned up some styles for both tabular and stacked inlines. Thanks Nathan Borror for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8240 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-08 19:54:34 +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
Luke Plant
7b4b1309d9
Added a 'name' attribute to the 'Save' button on admin change form
...
This makes it much easier/possible for testing tools e.g. twill to find
the 'Save' submit button.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8226 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-07 21:18:43 +00:00
Justin Bronn
79e68c225b
Merged the gis branch into trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-05 18:13:06 +00:00
Gary Wilson Jr
2a7f7e1b97
Removed some unused and duplicated imports.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 06:04:09 +00:00
Gary Wilson Jr
c85c8f8891
Fixed #7919 -- md5 and sha modules are deprecated since Python 2.5, use hashlib module when available. Patch from Karen Tracey.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8193 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 05:56:57 +00:00
Gary Wilson Jr
8a58f2216c
Fixed #8078 -- Fixed a Python 2.3 incompatibility in `contrib/admin/options.py`, thanks Karen Tracey.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8192 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 05:29:17 +00:00
Brian Rosner
d7dc2d3985
Fixed #8086 -- Removed 2.5 specific keyword argument to __import__. Thanks CHasenpflug for noticing this.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8188 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-02 00:33:21 +00:00
Brian Rosner
c4ba628231
Added a missing import from [8186].
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8187 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 23:31:20 +00:00
Brian Rosner
e608433ee7
Pass the correct data as the second parameter to find_module to correct admin.autodiscover(). Fixes #7922 . Thanks Alex Gaynor for being smarter than me.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8186 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 23:29:25 +00:00
Brian Rosner
85af264112
Reverted [8174]. It is causing some serious breakage right now. Need to investigate more.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 22:46:15 +00:00
Brian Rosner
4c0234215e
Fixed #5631 -- When fieldsets contains a field that is on the same line, it is now collapsable when collapse is set in classes. Thanks andybak for some research and Karen Tracey for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8177 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 20:00:30 +00:00
Brian Rosner
525e1e379a
Fixed #7922 -- admin.autodiscover() no longer eats ImportErrors for breakfast. Thanks Jan Rademaker and Alex Gaynor for their work on the ticket.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8174 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 19:10:55 +00:00
Brian Rosner
be17a801f6
Fixed #7885 -- Prevent duplicates in fields and fieldsets declarations. Thanks julien and wamberg for the patches.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 18:55:43 +00:00
Luke Plant
079e5bf1ec
Added a login link to the password reset completion screen.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-01 16:13:12 +00:00
Luke Plant
fcd837cd0f
Fixed #7723 - implemented a secure password reset form that uses a token and prompts user for new password.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-31 20:47:53 +00:00
Russell Keith-Magee
f7d123a731
Fixed #7880 -- Corrected the handling of fields in the admin that specify choices, so that the presence of choices overrides the decision to use a custom admin widget. This is primarily of interest to Date/Time fields. Thanks to camilonova for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 11:41:04 +00:00
Malcolm Tredinnick
726a24c609
Fixed #7992 -- Interpolate UTF-8 verbose_names correctly into unicode strings
...
in the admin interface. Patch from aabele. Refs #8016 .
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-30 00:52:01 +00:00
Russell Keith-Magee
bf777442fa
Fixed #7695 -- Modified template to trust help_text on a model field. Thanks to Ben Spaulding for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8137 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-29 13:32:47 +00:00
Russell Keith-Magee
174641b9b3
Fixed #6095 -- Added the ability to specify the model to use to manage a ManyToManyField. Thanks to Eric Florenzano for his excellent work on this patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-29 12:41:08 +00:00
Luke Plant
3992683ea3
Fixed #6109 again.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-25 14:44:56 +00:00
Jacob Kaplan-Moss
7b3cf13d32
Improved admin model registration options: you can now register using register(Model, **options) and even register(Model, ModelAdmin, **options). This isn't documented yet -- a much expanded version of docs/admin.txt is on the way.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8063 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-23 18:58:06 +00:00
Brian Rosner
62d9e278d7
Fixed #7898 -- Moved formset media definition to a media property in InlineAdminFormSet display helper and added InlineAdminForm media at the same time. This now properly renders all media associated with the formset and its display helper children. Thanks dima.kozlov for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8057 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-23 03:25:41 +00:00
Adrian Holovaty
29f0e8182f
Fixed #7847 -- Removed a whole bunch of unused imports from throughout the codebase. Thanks, julien
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8046 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22 03:24:09 +00:00
Brian Rosner
ca7ee4be17
Fixed #7858 -- Quick CSS fix for right-to-left written languages in inlines. Thanks mksoft for the report and patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8014 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-21 04:09:29 +00:00
Malcolm Tredinnick
ee90b7cf9a
Fixed filter_horizontal and filter_vertical handling in admin so that they can
...
be lists (aren't required to be tuples). It's less error-prone to use one item
lists than one-tuples, but this caused a crash.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 21:12:36 +00:00
Russell Keith-Magee
6c4c60b14a
Fixed #7775 -- Removed some duplicated code from the admin login sequence. Thanks to Mnewman for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20 11:37:20 +00:00
Russell Keith-Magee
69ac815a41
Fixed #7828 -- Removed some unnecessary imports from admin widgets. Thanks to Julien for the report.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 02:26:58 +00:00
Jacob Kaplan-Moss
46786b4193
Fixed #7741 : django.newforms is now django.forms. This is obviously a backwards-incompatible change. There's a warning upon import of django.newforms itself, but deeper imports will raise errors.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 01:22:26 +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
Malcolm Tredinnick
409ed9468f
Fixed #7670 -- Fixed a couple of missed changes from [7865]. Patch from jshaffer.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-08 05:29:23 +00:00
Adrian Holovaty
4406d283e1
Fixed #7478 -- Rolled QuerySetPaginator into the Paginator class, to simplify things. QuerySetPaginator still exists as an alias, for backwards compatibility. Thanks for the suggestion, batiste@dosimple.ch
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-08 02:08:33 +00:00
Luke Plant
6f76b9f58d
Simplified control flow for change made in r7535
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7536 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-05-16 22:53:39 +00:00
Luke Plant
7e4718f8d5
Fixed bug in staff_member_required decorator for the case where users share an email address.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-05-15 22:10:53 +00:00
Russell Keith-Magee
41635d2176
Removed mark_safe from the saved request path on the admin login form. This prevents a potential XSS attack. Formal announcement will be forthcoming.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-05-10 13:19:19 +00:00
Malcolm Tredinnick
a1e4b15f15
Fixed #3002 -- Fixed a problem with ordering by related models in the admin
...
interface. Patch from Ramiro Morales.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-28 02:40:57 +00:00
Malcolm Tredinnick
9c52d56f6f
Merged the queryset-refactor branch into trunk.
...
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245 , #1050 , #1656 , #1801 , #2076 , #2091 , #2150 , #2253 , #2306 , #2400 , #2430 , #2482 , #2496 , #2676 , #2737 , #2874 , #2902 , #2939 , #3037 , #3141 , #3288 , #3440 , #3592 , #3739 , #4088 , #4260 , #4289 , #4306 , #4358 , #4464 , #4510 , #4858 , #5012 , #5020 , #5261 , #5295 , #5321 , #5324 , #5325 , #5555 , #5707 , #5796 , #5817 , #5987 , #6018 , #6074 , #6088 , #6154 , #6177 , #6180 , #6203 , #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 02:50:16 +00:00
Malcolm Tredinnick
d15e290cb1
Fixed #7012 -- Added a missing file for CSS backgrounds with right-to-left
...
languages. Thanks, Amit Ramon.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-15 02:07:49 +00:00
Adrian Holovaty
054c2e4af3
Fixed #6852 -- Converted the admin to use the new paginator, to remove DeprecationWarnings. Thanks for the patch, nickefford
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7363 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-03-25 05:20:55 +00:00
Malcolm Tredinnick
9b52f35f35
Added "svn:eol-style native" to every text file in the tree (*.txt, *.html,
...
*.py, *.xml and AUTHORS, etc). Added "svn:ignore *.pyc" to some directories in
tests/regressiontests/ that were previously missing it.
Fixed #6545 , #6801 .
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7294 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-03-18 14:54:39 +00:00
Gary Wilson Jr
5ca0b9203b
Fixed #5701 -- Fixed decorators to take the name, attributes, and docstring of the function they decorate by adding a modified version of the `functools.wraps` function from Python 2.5. `wraps` has been altered to work with Django's `curry` function and with Python 2.3, which doesn't allow assignment of a function's `__name__` attribute. This fixes severaly annoyances, such as the online documentation for template filters served by the admin app. This change is backwards incompatible if, for some reason, you were relying on the name of a Django decorator instead of the function it decorates.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7153 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-25 06:02:35 +00:00
Malcolm Tredinnick
f1a24be01c
Fixed #6481 -- Fixed a bunch of import problems (and some whitespace cleanups).
...
Found by Bastian Kleineidam with help from pyflakes. Thanks.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7131 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-19 00:08:08 +00:00
Malcolm Tredinnick
25c4ab99e3
Fixed #6109 -- Marked fieldset descriptions as safe from auto-escaping. Good
...
catch, SomeGuy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-03 07:39:10 +00:00
Gary Wilson Jr
a01ebb4a50
Fixed #6354 -- Fixed url in `django/conf/urls/shortcut.py` to work with non-integer primary keys (refs #2033 ) and made use of the URL file in the admin urls.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-28 05:36:44 +00:00
Malcolm Tredinnick
d1793f1774
Fixed #6248 -- Fixed typo in urlify.js. Pointed out by arien.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6999 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-06 03:55:23 +00:00
Malcolm Tredinnick
402ca0b77b
Fixed #5044 -- Added Latvian character map for Javascript slug generation. Patch from arien.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-17 09:14:59 +00:00
Jacob Kaplan-Moss
76dd53ac08
Fixed #6116 : mark-safe the admin changelist table class. Thanks, zlobnyi antisvin.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-04 19:17:25 +00:00
Malcolm Tredinnick
f27365e5bd
Fixed #6061 -- Don't escape help_text in the admin interface (so that it
...
behaves as documented). Thanks, baumer.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-30 19:59:13 +00:00
Malcolm Tredinnick
0171f00761
Fixed #5706 -- Fixed a couple of XHTML incompatibilities. Based on a patch from
...
tvrg.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-29 16:32:29 +00:00