From 6aa950222fa284ae0602fc72cb2b8d6efb45a2e9 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 1 Oct 2018 20:52:21 +0200 Subject: Do not display DataTable error on prod --- ishtar_common/context_processors.py | 1 + ishtar_common/static/js/ishtar.js | 1 + ishtar_common/templates/base.html | 3 +++ ishtar_common/templates/blocks/DataTables.html | 2 ++ 4 files changed, 7 insertions(+) (limited to 'ishtar_common') diff --git a/ishtar_common/context_processors.py b/ishtar_common/context_processors.py index 225b004a4..8c965f99f 100644 --- a/ishtar_common/context_processors.py +++ b/ishtar_common/context_processors.py @@ -73,6 +73,7 @@ def get_base_context(request): dct['JQUERY_UI_URL'] = settings.JQUERY_UI_URL dct['COUNTRY'] = settings.COUNTRY dct['VERSION'] = __version__ + dct['DEBUG'] = settings.DEBUG medias = [DatePicker().media] dct['EXTRA_CSS'] = "" dct['EXTRA_JS'] = "" diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 5812dfd40..f05eb5a1b 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -42,6 +42,7 @@ var datatable_submit_search = function() {}; var shortcut_url = ''; var alert_url = ''; +var debug = false; var datatables_i18n; var current_modal; var default_search_vector; diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index b6d67ac59..b9270d910 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -61,6 +61,9 @@ {% endcompress %} {% block extra_head %} {% endblock %} + {% if DEBUG %}{% endif %} {% include "navbar.html" %} diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html index f2ae42412..70d47cb8d 100644 --- a/ishtar_common/templates/blocks/DataTables.html +++ b/ishtar_common/templates/blocks/DataTables.html @@ -184,6 +184,8 @@ jQuery(document).ready(function(){ ] }; + if (!debug) $.fn.dataTable.ext.errMode = 'none'; + $.extend(datatable_options, datatables_default); if (datatables_i18n) datatable_options['language'] = datatables_i18n; datatable_{{sname}} = jQuery("#grid_{{name}}").DataTable(datatable_options); -- cgit v1.2.3