mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity
3,009 Commits 29 Branches 451 Tags
Commit Graph

3009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Rosner
7dd2666bd0 newforms-admin: Merged from trunk up to [7829]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7830 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-03 15:24:08 +00:00
Simon Willison
f918f9180f newforms-admin: custom URL handling in admin now redirects to add trailing slash if needed - this fixes several bugs that occurred when you navigated to an admin page and omitted the trailing slash. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-02 08:32:55 +00:00
Simon Willison
2e5cc7413f newforms-admin: Fixed failing test by changing never_cache header to handle views that don't return a response object. The test traceback was: 
======================================================================
ERROR: Test add view restricts access and actually adds items.
----------------------------------------------------------------------
Traceback (most recent call last):
  File ".../tests/regressiontests/admin_views/tests.py", line 178, in testAddView
    post = self.client.post('/test_admin/admin/admin_views/article/add/', self.super_login)
  File ".../django/test/client.py", line 265, in post
    return self.request(**r)
  File ".../django/core/handlers/base.py", line 82, in get_response
    response = callback(request, *callback_args, **callback_kwargs)
  File ".../django/contrib/admin/sites.py", line 113, in root
    response = self.login(request)
  File ".../django/views/decorators/cache.py", line 45, in _wrapped_view_func
    add_never_cache_headers(response)
  File ".../django/utils/cache.py", line 118, in add_never_cache_headers
    patch_response_headers(response, cache_timeout=-1)
  File ".../django/utils/cache.py", line 106, in patch_response_headers
    if not response.has_header('ETag'):
AttributeError: 'NoneType' object has no attribute 'has_header'


git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-02 08:32:14 +00:00
Brian Rosner
0e8710d590 newforms-admin: Merged from trunk up to [7814]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-01 15:49:08 +00:00
Brian Rosner
595e9191f5 newforms-admin: Fixed #4074 -- Properly urlencode the ChangeList query string when the value has an ampersand. Thanks Tony Perkins and SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-30 17:38:13 +00:00
Brian Rosner
829fd5a967 newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7809 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-30 15:38:16 +00:00
Brian Rosner
c349ba4cfc newforms-admin: Fixed #7541 -- RelatedFieldWidgetWrapper now wraps the widget and not the just the render function which caused some stale values. Thanks lukas and Doug Napoleone. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 16:53:53 +00:00
Brian Rosner
c8da0874c7 newforms-admin: Merged from trunk up to [7766]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 15:42:33 +00:00
Simon Willison
f15845c573 newforms-admin: removed unnecessary import 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-26 15:23:51 +00:00
Luke Plant
1acafa0989 newforms-admin: Fixed #6566 - restored never_cache() decorator to admin views. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-24 20:35:14 +00:00
Luke Plant
56584a6652 newforms-admin: Fixed #6604 - removed useless code. Thanks Petr Marhoun, programmerq 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7736 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-24 19:44:31 +00:00
Luke Plant
cf438282aa newforms-admin: Fixed #6905 - allow custom form class to be used for password reset view 
Thanks programmerq for the idea


git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7735 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-24 18:11:05 +00:00
Luke Plant
48c706a43a newforms-admin: Updated password reset form for newforms syntax (missed in [7191]) 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7734 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-24 17:29:17 +00:00
Luke Plant
0ad37188cf newforms-admin: Fixed #4046 - ForeignKey's formfield does not respect limit_choices_to. Thanks ubernostrum, programmerq 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7733 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-24 15:41:14 +00:00
Brian Rosner
420f19aa35 newforms-admin: Merged from trunk up to [7729]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-23 21:05:02 +00:00
Brian Rosner
c929440fcd newforms-admin: Fixed #7502 -- Fixed an i18n breakge introduced in [7694]. Thanks frasern. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-20 07:40:45 +00:00
Brian Rosner
abe84c8648 newforms-admin: Removed a print statement in tests/regressiontests/admin_views/tests.py that snuck by. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-19 16:21:21 +00:00
Brian Rosner
d5899f17e9 newforms-admin: Merged from trunk up to [7706]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-19 16:04:52 +00:00
Brian Rosner
308cef4068 newforms-admin: Fixed #6943 and #7263 -- Handle multiple e-mail addresses when checking if it was mistakenly entered. Also prevent e-mail guessing by checking password before throwing an error. Thanks Michael Newman and Valera Grishin. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-18 19:05:16 +00:00
Simon Willison
86a946a1a6 newforms-admin: Fixed #7483 (thanks, Daniel Roseman) - delete view now correctly links to related objects 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-18 09:00:11 +00:00
Brian Rosner
de2f3900cf newforms-admin: Brought docs/admin.txt up to speed on missing options from ModelAdmin. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-17 22:45:59 +00:00
Brian Rosner
236a9dbd3c newforms-admin: Allowed for another heading level in docs/admin.txt. Also fixed up some other issues caught by generating the documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-17 22:00:48 +00:00
Brian Rosner
608af1f9d7 newforms-admin: Fixed #6718 -- Removed a circular import in contrib/auth/admin.py. Thanks Eric B. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 22:39:35 +00:00
Brian Rosner
dfe06aac0c newforms-admin: Fixed #7473 -- Fixed a title level inconsistency in docs/modelforms.txt. Thanks Visik7. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7670 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 21:32:53 +00:00
Brian Rosner
a253ec3743 newforms-admin: Merged from trunk up to [7668]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7669 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 20:36:34 +00:00
Brian Rosner
d0af06bad8 newforms-admin: Fixed an example relying on oldforms in the authentication docs. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7664 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 15:46:36 +00:00
Brian Rosner
032e092ecf newforms-admin: Fixed #7445 -- Removed an old reference to oldforms in the auth documentation. Thanks peterd12. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7663 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-16 15:41:20 +00:00
Simon Willison
10c7129eb0 newforms-admin: Fixed root_path in custom user add view 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-15 18:53:30 +00:00
Simon Willison
c6a26037e3 newforms-admin: Custom form for changing a user's password now sets root_path manually (it doesn't have access to an AdminSite instance so it has to roll its own) 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-15 18:42:15 +00:00
Simon Willison
e8cd4084b7 AdminSite.root() now figures out the base URL of the admin site and stashes it as self.root_path. This is made available to admin templates, avoiding the need to use relative URLs for links to higher level admin pages. One consequence of this change is that you can now reliably over-ride the userlinks block in a custom base_site.html template. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-15 18:21:11 +00:00
Simon Willison
faae7c0faf newforms-admin: AdminSite index and display_login_form method can now take an optional extra_context argument, allowing you to inject extra template variables in to them from an over-ridden method on a subclass 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7631 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-13 17:26:30 +00:00
Simon Willison
725293d51a newforms-admin: Made it easier to specify a custom template to be used in the admin section. You can now specify index_template and login_template properties on an AdminSite subclass, and change_form_template, change_list_template, object_history_template and delete_confirmation_template properties on a ModelAdmin subclass. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-13 15:42:43 +00:00
Simon Willison
f33bdf7e9c newforms-admin: custom changelist test now avoids model inheritance (since the admin doesn't support that yet) 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-12 21:50:13 +00:00
Simon Willison
a33bd6b594 newforms-admin: Added ability to pass extra_context argument to ModelAdmin's add_view, change_view, changelist_view, delete_view and history_view methods. This makes it easier to customise those pages; you can over-ride the methods in your subclass and call the super method with extra_context to feed additional variables to your custom admin templates. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-12 20:58:56 +00:00
Brian Rosner
f914b0a71b newforms-admin: Fixed #5731 -- Implemented ModelAdmin.radio_fields to match trunk's radio_admin. Removed legacy code and added tests. Thanks Karen Tracey for the initial work. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-12 20:13:27 +00:00
Brian Rosner
4a6965b308 newforms-admin: Fixed a few links in the inline documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-11 20:35:34 +00:00
Brian Rosner
d1bc198e00 newforms-admin: Added inline documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-11 20:28:37 +00:00
Brian Rosner
c55c758531 newforms-admin: Moved the inner Admin docs over to the admin docs and updated to work with ModelAdmin. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-11 18:01:14 +00:00
Brian Rosner
530670e27f newforms-admin: Fixed #6075 -- Implemented max_num on formsets and model formsets. Added a hook on InlineModelAdmin to customize in the admin interface. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-11 03:58:01 +00:00
Brian Rosner
edf396da59 newforms-admin: Removed the leading underscore from _formset_factory. It was missed in [7605]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 19:58:25 +00:00
Brian Rosner
be810670ff newforms-admin: Fixed #5999 -- When a session expires properly route the 
flow to call the correct view. Thanks favo and Michael Newman.


git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 16:05:09 +00:00
Brian Rosner
98d30caedb newforms-admin: Fixed #7410 -- Added save_as to the context of a couple auth views. Thanks James Turnbull. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 15:17:32 +00:00
Brian Rosner
0f3f082ed5 newforms-admin: Fixed #5765 -- non_form_errors now display properly for inline 
formsets. Thanks Honza Kral.


git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 05:01:17 +00:00
Brian Rosner
c63faa1f49 newforms-admin: Allow a custom formset on InlineModelAdmin. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 04:59:12 +00:00
Brian Rosner
07b82590d8 newforms-admin: Fixed #6809 -- non_field_errors are now properly displayed. Thanks peschler. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 04:45:19 +00:00
Brian Rosner
c6b53bec10 newforms-admin: Added documentation on formsets. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 04:40:13 +00:00
Brian Rosner
1fd3db4ab0 newforms-admin: Removed the leading underscore from modelforms factory functions. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 04:15:06 +00:00
Brian Rosner
4530a408c4 newforms-admin: Merged from trunk up to [7602]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 04:03:09 +00:00
Brian Rosner
3b92ced518 newforms-admin: Fixed #5520 -- Implemented save_as functionality. This also 
properly makes inlines work as well.


git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7603 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-10 03:54:05 +00:00
Brian Rosner
bb75091bf4 newforms-admin: Fixed #6810 -- Added tests for admin views. Thanks rmyers! 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7589 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-07 23:09:09 +00:00