matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Detect Django's debug mode and render the server side error page properly.

Browse Source 
Signed-off-by: Eric Riggs <ericriggs42@gmail.com>
This commit is contained in:
Eric Riggs
2018-03-20 03:43:21 -04:00
committed by Roberto Rosario
parent d2eef74bb8
commit 0fbfb17d83
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mayan/apps/appearance/static/appearance/js/partial_navigation.js
View File

@@ -143,6 +143,9 @@ PartialNavigation.prototype.processAjaxRequestError = function (jqXHR) {
* user. * user.
*/ */
if (djangoDEBUG) {
$('#ajax-content').html('<pre class="text-primary" style="background-color:#ffe7ae"><code>' + jqXHR.responseText + '</code></pre>');
} else {
if (jqXHR.status == 0) { if (jqXHR.status == 0) {
$('#modal-server-error .modal-body').html($('#template-error').html()); $('#modal-server-error .modal-body').html($('#template-error').html());
$('#modal-server-error').modal('show') $('#modal-server-error').modal('show')

1
mayan/apps/appearance/templates/appearance/root.html
View File

@@ -170,6 +170,7 @@
{# Transfer variable from Django to javascript #} {# Transfer variable from Django to javascript #}
var initialURL = '{% url home_view %}'; var initialURL = '{% url home_view %}';
Dropzone.autoDiscover = false; Dropzone.autoDiscover = false;
var djangoDEBUG = {% if debug %}true{% else %}false{% endif %};
</script> </script>
<script src="{% static 'appearance/js/base.js' %}" type="text/javascript"></script> <script src="{% static 'appearance/js/base.js' %}" type="text/javascript"></script>