Commit de977c85 authored by Brian Rosner's avatar Brian Rosner
Browse files

Fixed #8522 -- Allow app_index to take extra_context to be consistent with the... 

Fixed #8522 -- Allow app_index to take extra_context to be consistent with the other views in the admin. Thanks Jannis Leidel for the patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8529 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 82a1d547

django/contrib/admin/sites.py

+7 −3
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ class AdminSite(object): 
            context_instance=template.RequestContext(request)

        )

        

    def app_index(self, request, app_label):

    def app_index(self, request, app_label, extra_context=None):

        user = request.user

        has_module_perms = user.has_module_perms(app_label)

        app_dict = {}
@@ -399,10 +399,14 @@ class AdminSite(object): 
                        raise http.Http404('The requested admin page does not exist.')

        # Sort the models alphabetically within each app.

        app_dict['models'].sort(lambda x, y: cmp(x['name'], y['name']))

        return render_to_response(self.app_index_template or 'admin/app_index.html', {

        context = {

            'title': _('%s administration' % capfirst(app_label)),

            'app_list': [app_dict]

        }, context_instance=template.RequestContext(request))

        }

        context.update(extra_context or {})

        return render_to_response(self.app_index_template or 'admin/app_index.html', context,

            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.