Bläddra i källkod

Make PopupError render correctly as json

When the request is ajax, we need to turn the PopupError data into json. So
skip the `request' field.
bc Wong 13 år sedan
förälder
incheckning
c2c2f2b40a
1 ändrade filer med 4 tillägg och 2 borttagningar
  1. 4 2
      desktop/core/src/desktop/lib/django_util.py

+ 4 - 2
desktop/core/src/desktop/lib/django_util.py

@@ -349,8 +349,10 @@ class PopupException(Exception):
     self.detail = detail
 
   def response(self, request):
-    return render("popup_error.mako", request,
-      dict(title=self.title, message=self.message, detail=self.detail, request=request))
+    data = dict(title=self.title, message=self.message, detail=self.detail)
+    if not request.ajax:
+      data['request'] = request
+    return render("popup_error.mako", request, data)
 
 
 class PopupWithJframe(object):