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

3041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Rosner
66893002f3 newforms-admin: Merged from trunk up to [7952]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 21:42:08 +00:00
Brian Rosner
efc84a8a63 newforms-admin: Moved contrib ModelAdmin classes to an admin.py file in their respective apps. This is allowed since [7872]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 20:23:02 +00:00
Brian Rosner
dd5197f081 newforms-admin: Merged from trunk up to [7950]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 19:00:37 +00:00
Brian Rosner
b2231a28e8 newforms-admin: Merged from trunk up to [7947]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7948 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-18 15:47:10 +00:00
Brian Rosner
9188013889 newforms-admin: Merged from trunk up to [7941]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-17 20:12:21 +00:00
Brian Rosner
1eed9b076c newforms-admin: Fixed #7790 -- Check form fields, not model fields when testing for field existence in fields and fieldsets. Thanks Rozza for catching this and writing an initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-17 16:48:27 +00:00
Brian Rosner
81b185319c newforms-admin: Fixed #7794 -- Allow BaseModelFormSet classes to work as an inline formset. This just loosens the validator checks. Thanks paltman for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-17 16:11:49 +00:00
Brian Rosner
dce7cfee16 newforms-admin: Merged from trunk up to [7928]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-16 21:12:43 +00:00
Brian Rosner
c546b55a98 newforms-admin: Removed a bit of code that snuck by in [7935] that shouldn't have been committed yet. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-16 19:22:44 +00:00
Brian Rosner
075a2fd938 newforms-admin: Fixed #5490 -- Properly quote special characters in primary keys in the admin. Added tests to ensure functionality. This also moves quote and unquote to django/contrib/admin/util.py. Thanks jdetaeye and shanx for all your help. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7935 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-16 19:21:15 +00:00
Brian Rosner
584c41aff7 newforms-admin: Fixed #7466 -- Generate a root_path for admindocs views so the userlinks are properly linked. Thanks handelaar for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-16 13:53:39 +00:00
Brian Rosner
885ade7784 newforms-admin: Fixed #7553 -- Reverted [7824] in favor of a better fix in #7553. The never_cache decorator is no longer special casing None. Thanks Michael Newman for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-16 03:42:42 +00:00
Brian Rosner
83afd39b1a newforms-admin: Fixed #7772 -- Moved the validation check for when both fields and fieldsets are specified on a ModelAdmin to django/contrib/admin/validation.py. Thanks Julien Phalip for catching this. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-16 02:01:18 +00:00
Brian Rosner
5317864e5f newforms-admin: Fixed #7771 -- Improved the validation check on the ordering field. Now takes '?' and 'field1__field2' syntax into consideration. Thanks Michael Jung for catching this. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-16 01:02:57 +00:00
Brian Rosner
55744e997f newforms-admin: Fixed #7230 -- Added a save_m2m method to BaseModelFormSet when commit=False is passed to save. Thanks Books Travis for the original report. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-15 22:41:17 +00:00
Brian Rosner
a2c7bfc1be newforms-admin: Fixed #5374 -- Added validation for ModelAdmin and InlineModelAdmin options including tests. Thanks mrts for initial legwork. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-15 21:43:21 +00:00
Joseph Kocherhans
affc9b9b3b newforms-admin: Revmoved some old dead code and whitespace cleanup. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-15 04:38:10 +00:00
Joseph Kocherhans
85eb8b3fd3 newforms-admin: Removed a comment that was no longer applicable and cleaned up some whitespace. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-15 04:37:57 +00:00
Joseph Kocherhans
641711dd9d newforms-admin: Removed some places where model was being passed around for no reason. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-15 04:37:43 +00:00
Brian Rosner
2624f4ea56 newforms-admin: Merged from trunk up to [7917]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-14 05:04:57 +00:00
Adrian Holovaty
f3cda0b77a newforms-admin: Fixed #7702 -- Removed redundant imports in django/contrib/admin/options.py. Thanks, Honza 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-13 17:26:43 +00:00
Brian Rosner
60c060c476 newforms-admin: Merged from trunk up to [7877]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7881 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-10 20:47:18 +00:00
Brian Rosner
9cbd07b681 newforms-admin: Fixed #5873 -- When a validation error occurs in a fieldset that is collapsed properly idenitfy it so it uncollapses to reveal the error. Thanks Jonas for the patch and Ariel Calzada for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-10 20:28:12 +00:00
Brian Rosner
4772550a3c newforms-admin: Fixed #5628 -- When inlines have validation errors an error message is now displayed at the top of the page. Thanks Petr Marhoun for the improved patch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7878 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-10 20:24:46 +00:00
Brian Rosner
b46dc92ad3 newforms-admin: Fixed #7692 -- Fixed a syntax error in django/contrib/admin/options.py, my bad. Thanks jwmayfield for keeping me in check. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-09 18:59:42 +00:00
Brian Rosner
7d45454e55 newforms-admin: Fixed #7564 -- Make position argument string interpolation use keywords instead. Works better for translators and get rid of make-messages.py warnings. Thanks Marc Garcia for the report and permon for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-09 18:29:47 +00:00
Brian Rosner
d9a2441c48 newforms-admin: Added some documentation about media defintions in ModelAdmin classes. Fixed #7129. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-09 18:09:38 +00:00
Brian Rosner
2e72445fce newforms-admin: Added autodiscover functionality to django.contrib.admin. This makes the admin aware of per-app admin.py modules and does an import on them when explicitly called. Docs show how this is used. Fixed #6003, #6776, #6776. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-09 16:01:33 +00:00
Brian Rosner
84541cd244 newforms-admin: Allow an overridden _construct_form to easily pass parameters through to the form constructor in formsets. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-07 00:31:29 +00:00
Brian Rosner
21974955c4 newforms-admin: Fixed #7617 -- Adjusted the call to ModelFormMetaclass.__new__ in modelform_factory to work with the new signature introduced in [7847]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-06 15:28:05 +00:00
Brian Rosner
8c8513281e newforms-admin: Merged from trunk up to [7852]. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7853 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-06 15:23:24 +00:00
Brian Rosner
058a190a79 newforms-admin: Fixed #7620 -- Changed a hard-coded call to type.__new__ to use super in MediaDefiningClass metaclass. Thanks Christian Tanzer. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-03 23:15:17 +00:00
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