Browse Source

HUE-8139 [core] Fix django-debug-toolbar 1.9.1 to work with django_debug_panel
* remove toolbar middleware to enable SQL panel
* Fix middlewares to enable capture Ajax calls

Ying Chen 7 years ago
parent
commit
1cd55fdfd3

+ 2 - 1
desktop/core/ext-py/django-debug-panel-0.8.3/debug_panel/middleware.py

@@ -41,10 +41,11 @@ class DebugPanelMiddleware(debug_toolbar.middleware.DebugToolbarMiddleware):
         Otherwise we fallback to the default debug_toolbar middleware.
         """
 
+        res = super(DebugPanelMiddleware, self).process_request(request)
         try:
             res = resolve(request.path, urlconf=debug_panel.urls)
         except Resolver404:
-            return super(DebugPanelMiddleware, self).process_request(request)
+            return res
 
         return res.func(request, *res.args, **res.kwargs)
 

+ 3 - 2
desktop/core/ext-py/django-debug-toolbar-1.9.1/debug_toolbar/middleware.py

@@ -61,8 +61,9 @@ class DebugToolbarMiddleware(MiddlewareMixin):
             return
 
         # Don't render the toolbar during AJAX requests.
-        if request.is_ajax():
-            return
+        #### enable this for django_debug_panel
+        #if request.is_ajax():
+        #    return
 
         toolbar = DebugToolbar(request)
         self.__class__.debug_toolbars[threading.current_thread().ident] = toolbar

+ 2 - 2
desktop/core/src/desktop/settings.py

@@ -590,8 +590,7 @@ def show_toolbar(request):
 
 if DEBUG and desktop.conf.ENABLE_DJANGO_DEBUG_TOOL.get():
   idx = MIDDLEWARE_CLASSES.index('desktop.middleware.ClusterMiddleware')
-  MIDDLEWARE_CLASSES.insert(idx + 1, 'debug_toolbar.middleware.DebugToolbarMiddleware')
-  MIDDLEWARE_CLASSES.insert(idx + 2, 'debug_panel.middleware.DebugPanelMiddleware')
+  MIDDLEWARE_CLASSES.insert(idx + 1, 'debug_panel.middleware.DebugPanelMiddleware')
 
   INSTALLED_APPS += (
       'debug_toolbar',
@@ -614,6 +613,7 @@ if DEBUG and desktop.conf.ENABLE_DJANGO_DEBUG_TOOL.get():
   ]
 
   DEBUG_TOOLBAR_CONFIG = {
+      'JQUERY_URL': os.path.join(STATIC_ROOT, 'desktop/ext/js/jquery/jquery-2.2.4.min.js'),
       'RESULTS_CACHE_SIZE': 200,
       'SHOW_TOOLBAR_CALLBACK': show_toolbar
   }