Changeset 7630

Timestamp:

06/13/08 10:42:43 (4 months ago)

Author:

simon

Message:

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.

Files:

• django/branches/newforms-admin/django/contrib/admin/options.py (modified) (10 diffs)
• django/branches/newforms-admin/django/contrib/admin/sites.py (modified) (7 diffs)
• django/branches/newforms-admin/tests/regressiontests/admin_views/models.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/regressiontests/admin_views/tests.py (modified) (2 diffs)
• django/branches/newforms-admin/tests/templates/admin (deleted)
• django/branches/newforms-admin/tests/templates/custom_admin (added)
• django/branches/newforms-admin/tests/templates/custom_admin/change_form.html (added)
• django/branches/newforms-admin/tests/templates/custom_admin/change_list.html (copied) (copied from django/branches/newforms-admin/tests/templates/admin/admin_views/customarticle/change_list.html)
• django/branches/newforms-admin/tests/templates/custom_admin/delete_confirmation.html (added)
• django/branches/newforms-admin/tests/templates/custom_admin/index.html (added)
• django/branches/newforms-admin/tests/templates/custom_admin/login.html (added)
• django/branches/newforms-admin/tests/templates/custom_admin/object_history.html (added)

django/branches/newforms-admin/django/contrib/admin/options.py

@@ -60 +60 @@
-    def __init__(self, form, fieldsets, prepopulated_fields):
-        self.form, self.fieldsets = form, fieldsets
-
+
+
+
+
-
-    def __iter__(self):
@@ -234 +237 @@
-    ordering = None
-    inlines = []
+    
+    # Custom templates (designed to be over-ridden in subclasses)
+    change_form_template = None
+    change_list_template = None
+    delete_confirmation_template = None
+    object_history_template = None
-
-    def __init__(self, model, admin_site):
@@ -373 +382 @@
-                post_url_continue += "?_popup=1"
-            return HttpResponseRedirect(post_url_continue % pk_value)
+        
-        if request.POST.has_key("_popup"):
-            return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
@@ -471 +481 @@
-            'save_on_top': self.save_on_top,
-        })
-
+self.change_form_template or 
-            "admin/%s/%s/change_form.html" % (app_label, opts.object_name.lower()),
-            "admin/%s/change_form.html" % app_label,
@@ -627 +637 @@
-                return render_to_response('admin/invalid_setup.html', {'title': _('Database error')})
-            return HttpResponseRedirect(request.path + '?' + ERROR_FLAG + '=1')
+        
-        context = {
-            'title': cl.title,
@@ -634 +645 @@
-        context.update({'has_add_permission': self.has_add_permission(request)}),
-        context.update(extra_context or {})
-
+self.change_list_template or 
-            'admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()),
-            'admin/%s/change_list.html' % app_label,
@@ -677 +688 @@
-                return HttpResponseRedirect("../../../../")
-            return HttpResponseRedirect("../../")
+        
-        context = {
-            "title": _("Are you sure?"),
@@ -686 +698 @@
-        }
-        context.update(extra_context or {})
-
+self.delete_confirmation_template or 
-            "admin/%s/%s/delete_confirmation.html" % (app_label, opts.object_name.lower()),
-            "admin/%s/delete_confirmation.html" % app_label,
@@ -698 +710 @@
-        model = self.model
-        opts = model._meta
-
-
+
+
+
+
-        # If no history was found, see whether this object even exists.
-        obj = get_object_or_404(model, pk=object_id)
@@ -709 +723 @@
-        }
-        context.update(extra_context or {})
-
+self.object_history_template or 
-            "admin/%s/%s/object_history.html" % (opts.app_label, opts.object_name.lower()),
-            "admin/%s/object_history.html" % opts.app_label,

django/branches/newforms-admin/django/contrib/admin/sites.py

@@ -24 +24 @@
-    pass
-
-def _display_login_form(request, error_message=''):
-    request.session.set_test_cookie()
-    if request.POST and request.POST.has_key('post_data'):
-        # User has failed login BUT has previously saved post data.
-        post_data = request.POST['post_data']
-    elif request.POST:
-        # User's session must have expired; save their post data.
-        post_data = _encode_post_data(request.POST)
-    else:
-        post_data = _encode_post_data({})
-    return render_to_response('admin/login.html', {
-        'title': _('Log in'),
-        'app_path': request.path,
-        'post_data': post_data,
-        'error_message': error_message
-    }, context_instance=template.RequestContext(request))
-
-def _encode_post_data(post_data):
-    from django.conf import settings
@@ -57 +40 @@
-
-class AdminSite(object):
+    """
+    An AdminSite object encapsulates an instance of the Django admin application, ready
+    to be hooked in to your URLConf. Models are registered with the AdminSite using the
+    register() method, and the root() method can then be used as a Django view function
+    that presents a full admin interface for the collection of registered models.
+    """
+    
+    index_template = None
+    login_template = None
+    
-    def __init__(self):
-        self._registry = {} # model_class class -> admin_class instance
@@ -120 +113 @@
-                # expired sessions and continue through (#5999)
-                return response
-
-
-        if url == '':
@@ -215 +207 @@
-            else:
-                message = ""
-_
+self.
-
-        # Check that the user accepts cookies.
-        if not request.session.test_cookie_worked():
-            message = _("Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again.")
-_
+self.
-
-        # Check the password.
@@ -236 +228 @@
-                else:
-                    message = _("Your e-mail address is not your username. Try '%s' instead.") % user.username
-_
+self.
-
-        # The user data is correct; log in the user in and continue.
@@ -256 +248 @@
-                        return http.HttpResponseRedirect(request.path)
-            else:
-_
+self.
-
-    def index(self, request):
@@ -301 +293 @@
-            app['models'].sort(lambda x, y: cmp(x['name'], y['name']))
-
-
+self.index_template or 
-            'title': _('Site administration'),
-            'app_list': app_list,
-        }, context_instance=template.RequestContext(request))
-
+    def display_login_form(self, request, error_message=''):
+        request.session.set_test_cookie()
+        if request.POST and request.POST.has_key('post_data'):
+            # User has failed login BUT has previously saved post data.
+            post_data = request.POST['post_data']
+        elif request.POST:
+            # User's session must have expired; save their post data.
+            post_data = _encode_post_data(request.POST)
+        else:
+            post_data = _encode_post_data({})
+        return render_to_response(self.login_template or 'admin/login.html', {
+            'title': _('Log in'),
+            'app_path': request.path,
+            'post_data': post_data,
+            'error_message': error_message
+        }, context_instance=template.RequestContext(request))
+
+
-# This global object represents the default admin site, for the common case.
-# You can instantiate AdminSite in your own code to create a custom admin site.

django/branches/newforms-admin/tests/regressiontests/admin_views/models.py

@@ -1 +1 @@
-from django.db import models
-from django.contrib import admin
-
-
-class Article(models.Model):
@@ -25 +24 @@
-
-class CustomArticleAdmin(admin.ModelAdmin):
+    """
+    Tests various hooks for using custom templates and contexts.
+    """
+    change_list_template = 'custom_admin/change_list.html'
+    change_form_template = 'custom_admin/change_form.html'
+    object_history_template = 'custom_admin/object_history.html'
+    delete_confirmation_template = 'custom_admin/delete_confirmation.html'
+    
-    def changelist_view(self, request):
-        "Test that extra_context works"

django/branches/newforms-admin/tests/regressiontests/admin_views/tests.py

@@ -6 +6 @@
-
-# local test models
-
+, CustomArticle
-
-def get_perm(Model, perm):
@@ -184 +184 @@
-        self.client.get('/test_admin/admin/logout/')
-        
-ChangelistView
+ModelAdminTemplates
-        self.client.get('/test_admin/admin/')
-        self.client.post('/test_admin/admin/', self.super_login)
+        
+        # Test custom change list template with custom extra context
-        request = self.client.get('/test_admin/admin/admin_views/customarticle/')
-        self.failUnlessEqual(request.status_code, 200)
-        self.assert_("var hello = 'Hello!';" in request.content)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    def testDeleteView(self):
-        """Delete view should restrict access and actually delete items."""