Commit cf1f36bb authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Deprecated current_app in TemplateResponse and render(_to_response).

parent e53495ba

django/contrib/admin/actions.py

+3 −1
Original line number Diff line number Diff line
@@ -76,11 +76,13 @@ def delete_selected(modeladmin, request, queryset): 
        action_checkbox_name=helpers.ACTION_CHECKBOX_NAME,

    )



    request.current_app = modeladmin.admin_site.name



    # Display the confirmation page

    return TemplateResponse(request, modeladmin.delete_selected_confirmation_template or [

        "admin/%s/%s/delete_selected_confirmation.html" % (app_label, opts.model_name),

        "admin/%s/delete_selected_confirmation.html" % app_label,

        "admin/delete_selected_confirmation.html"

    ], context, current_app=modeladmin.admin_site.name)

    ], context)



delete_selected.short_description = ugettext_lazy("Delete selected %(verbose_name_plural)s")

django/contrib/admin/options.py

+13 −4
Original line number Diff line number Diff line
@@ -1120,11 +1120,13 @@ class ModelAdmin(BaseModelAdmin): 
        else:

            form_template = self.change_form_template



        request.current_app = self.admin_site.name



        return TemplateResponse(request, form_template or [

            "admin/%s/%s/change_form.html" % (app_label, opts.model_name),

            "admin/%s/change_form.html" % app_label,

            "admin/change_form.html"

        ], context, current_app=self.admin_site.name)

        ], context)



    def response_add(self, request, obj, post_url_continue=None):

        """
@@ -1349,12 +1351,14 @@ class ModelAdmin(BaseModelAdmin): 
        opts = self.model._meta

        app_label = opts.app_label



        request.current_app = self.admin_site.name



        return TemplateResponse(request,

            self.delete_confirmation_template or [

                "admin/{}/{}/delete_confirmation.html".format(app_label, opts.model_name),

                "admin/{}/delete_confirmation.html".format(app_label),

                "admin/delete_confirmation.html"

            ], context, current_app=self.admin_site.name)

            ], context)



    def get_inline_formsets(self, request, formsets, inline_instances,

                            obj=None):
@@ -1632,11 +1636,13 @@ class ModelAdmin(BaseModelAdmin): 
        )

        context.update(extra_context or {})



        request.current_app = self.admin_site.name



        return TemplateResponse(request, self.change_list_template or [

            'admin/%s/%s/change_list.html' % (app_label, opts.model_name),

            'admin/%s/change_list.html' % app_label,

            'admin/change_list.html'

        ], context, current_app=self.admin_site.name)

        ], context)



    @csrf_protect_m

    @transaction.atomic
@@ -1723,11 +1729,14 @@ class ModelAdmin(BaseModelAdmin): 
            preserved_filters=self.get_preserved_filters(request),

        )

        context.update(extra_context or {})



        request.current_app = self.admin_site.name



        return TemplateResponse(request, self.object_history_template or [

            "admin/%s/%s/object_history.html" % (app_label, opts.model_name),

            "admin/%s/object_history.html" % app_label,

            "admin/object_history.html"

        ], context, current_app=self.admin_site.name)

        ], context)



    def _create_formsets(self, request, obj, change):

        "Helper function to generate formsets for add/change_view."

django/contrib/admin/sites.py

+7 −3
Original line number Diff line number Diff line
@@ -436,9 +436,11 @@ class AdminSite(object): 
            app_list=app_list,

        )

        context.update(extra_context or {})



        request.current_app = self.name



        return TemplateResponse(request, self.index_template or

                                'admin/index.html', context,

                                current_app=self.name)

                                'admin/index.html', context)



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

        app_name = apps.get_app_config(app_label).verbose_name
@@ -494,10 +496,12 @@ class AdminSite(object): 
        )

        context.update(extra_context or {})



        request.current_app = self.name



        return TemplateResponse(request, self.app_index_template or [

            'admin/%s/app_index.html' % app_label,

            'admin/app_index.html'

        ], context, current_app=self.name)

        ], context)



# 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/contrib/auth/admin.py

+4 −1
Original line number Diff line number Diff line
@@ -158,10 +158,13 @@ class UserAdmin(admin.ModelAdmin): 
            'show_save': True,

        }

        context.update(admin.site.each_context())



        request.current_app = self.admin_site.name



        return TemplateResponse(request,

            self.change_user_password_template or

            'admin/auth/user/change_password.html',

            context, current_app=self.admin_site.name)

            context)



    def response_add(self, request, obj, post_url_continue=None):

        """

django/contrib/auth/views.py

+40 −16
Original line number Diff line number Diff line
@@ -60,8 +60,11 @@ def login(request, template_name='registration/login.html', 
    }

    if extra_context is not None:

        context.update(extra_context)

    return TemplateResponse(request, template_name, context,

                            current_app=current_app)



    if current_app is not None:

        request.current_app = current_app



    return TemplateResponse(request, template_name, context)





def logout(request, next_page=None,
@@ -96,8 +99,11 @@ def logout(request, next_page=None, 
    }

    if extra_context is not None:

        context.update(extra_context)

    return TemplateResponse(request, template_name, context,

        current_app=current_app)



    if current_app is not None:

        request.current_app = current_app



    return TemplateResponse(request, template_name, context)





def logout_then_login(request, login_url=None, current_app=None, extra_context=None):
@@ -179,8 +185,11 @@ def password_reset(request, is_admin_site=False, 
    }

    if extra_context is not None:

        context.update(extra_context)

    return TemplateResponse(request, template_name, context,

                            current_app=current_app)



    if current_app is not None:

        request.current_app = current_app



    return TemplateResponse(request, template_name, context)





def password_reset_done(request,
@@ -191,8 +200,11 @@ def password_reset_done(request, 
    }

    if extra_context is not None:

        context.update(extra_context)

    return TemplateResponse(request, template_name, context,

                            current_app=current_app)



    if current_app is not None:

        request.current_app = current_app



    return TemplateResponse(request, template_name, context)





# Doesn't need csrf_protect since no-one can guess the URL
@@ -241,8 +253,11 @@ def password_reset_confirm(request, uidb64=None, token=None, 
    }

    if extra_context is not None:

        context.update(extra_context)

    return TemplateResponse(request, template_name, context,

                            current_app=current_app)



    if current_app is not None:

        request.current_app = current_app



    return TemplateResponse(request, template_name, context)





def password_reset_complete(request,
@@ -254,8 +269,11 @@ def password_reset_complete(request, 
    }

    if extra_context is not None:

        context.update(extra_context)

    return TemplateResponse(request, template_name, context,

                            current_app=current_app)



    if current_app is not None:

        request.current_app = current_app



    return TemplateResponse(request, template_name, context)





@sensitive_post_parameters()
@@ -288,8 +306,11 @@ def password_change(request, 
    }

    if extra_context is not None:

        context.update(extra_context)

    return TemplateResponse(request, template_name, context,

                            current_app=current_app)



    if current_app is not None:

        request.current_app = current_app



    return TemplateResponse(request, template_name, context)





@login_required
@@ -301,5 +322,8 @@ def password_change_done(request, 
    }

    if extra_context is not None:

        context.update(extra_context)

    return TemplateResponse(request, template_name, context,

                            current_app=current_app)
 


    if current_app is not None:

        request.current_app = current_app



    return TemplateResponse(request, template_name, context)