From 0fbfb17d839e5e6b51eb35587e5ee7dd3654ceba Mon Sep 17 00:00:00 2001 From: Eric Riggs Date: Tue, 20 Mar 2018 03:43:21 -0400 Subject: [PATCH] Detect Django's debug mode and render the server side error page properly. Signed-off-by: Eric Riggs --- .../static/appearance/js/partial_navigation.js | 13 ++++++++----- .../apps/appearance/templates/appearance/root.html | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/mayan/apps/appearance/static/appearance/js/partial_navigation.js b/mayan/apps/appearance/static/appearance/js/partial_navigation.js index 6cabfb7baa..5f9b0e29fa 100644 --- a/mayan/apps/appearance/static/appearance/js/partial_navigation.js +++ b/mayan/apps/appearance/static/appearance/js/partial_navigation.js @@ -143,12 +143,15 @@ PartialNavigation.prototype.processAjaxRequestError = function (jqXHR) { * user. */ - if (jqXHR.status == 0) { - $('#modal-server-error .modal-body').html($('#template-error').html()); - $('#modal-server-error').modal('show') + if (djangoDEBUG) { + $('#ajax-content').html('
' + jqXHR.responseText + '
'); } else { - $('#ajax-content').html(jqXHR.responseText); - } + if (jqXHR.status == 0) { + $('#modal-server-error .modal-body').html($('#template-error').html()); + $('#modal-server-error').modal('show') + } else { + $('#ajax-content').html(jqXHR.responseText); + } } PartialNavigation.prototype.setLocation = function (newLocation, pushState) { diff --git a/mayan/apps/appearance/templates/appearance/root.html b/mayan/apps/appearance/templates/appearance/root.html index d4c0c9befe..f9fc425a86 100644 --- a/mayan/apps/appearance/templates/appearance/root.html +++ b/mayan/apps/appearance/templates/appearance/root.html @@ -170,7 +170,8 @@ {# Transfer variable from Django to javascript #} var initialURL = '{% url home_view %}'; Dropzone.autoDiscover = false; - + var djangoDEBUG = {% if debug %}true{% else %}false{% endif %}; + {% endcompress %}