fix current_app parameter deleted in TemplateResponse in django 1.10

birui · Nov 10, 2016 · 4b601d8 · 4b601d8
1 parent fa52c31
commit 4b601d8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/xadmin/views/base.py b/xadmin/views/base.py
@@ -248,7 +248,7 @@ def __init__(self, request, *args, **kwargs):
         self.request = request
         self.request_method = request.method.lower()
         self.user = request.user
-
+        self.request.current_app = self.admin_site.name
         self.base_plugins = [p(self) for p in getattr(self,
                                                       "plugin_classes", [])]
 

diff --git a/xadmin/views/delete.py b/xadmin/views/delete.py
@@ -39,7 +39,7 @@ def get(self, request, object_id):
         context = self.get_context()
 
         return TemplateResponse(request, self.delete_confirmation_template or
-                                self.get_template_list("views/model_delete_confirm.html"), context, current_app=self.admin_site.name)
+                                self.get_template_list("views/model_delete_confirm.html"), context)
 
     @csrf_protect_m
     @transaction.atomic

diff --git a/xadmin/views/edit.py b/xadmin/views/edit.py
@@ -407,7 +407,7 @@ def get_response(self):
         return TemplateResponse(
             self.request, self.add_form_template or self.get_template_list(
                 'views/model_form.html'),
-            context, current_app=self.admin_site.name)
+            context)
 
     @filter_hook
     def post_response(self):
@@ -494,7 +494,7 @@ def get_response(self, *args, **kwargs):
         return TemplateResponse(
             self.request, self.change_form_template or self.get_template_list(
                 'views/model_form.html'),
-            context, current_app=self.admin_site.name)
+            context)
 
     def post(self, request, *args, **kwargs):
         if "_saveasnew" in self.request.POST:

diff --git a/xadmin/views/form.py b/xadmin/views/form.py
@@ -156,7 +156,7 @@ def get_response(self):
 
         return TemplateResponse(
             self.request, self.form_template,
-            context, current_app=self.admin_site.name)
+            context)
 
     @filter_hook
     def post_response(self):