diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-10-01 20:52:21 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-10-01 20:52:21 +0200 |
| commit | 6aa950222fa284ae0602fc72cb2b8d6efb45a2e9 (patch) | |
| tree | 1f381a194af3a3ba176781f2d635389be421b25f | |
| parent | 832d65819da20106006e80cddd101fe3ad49363e (diff) | |
| download | Ishtar-6aa950222fa284ae0602fc72cb2b8d6efb45a2e9.tar.bz2 Ishtar-6aa950222fa284ae0602fc72cb2b8d6efb45a2e9.zip | |
Do not display DataTable error on prod
| -rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_warehouse.html | 4 | ||||
| -rw-r--r-- | ishtar_common/context_processors.py | 1 | ||||
| -rw-r--r-- | ishtar_common/static/js/ishtar.js | 1 | ||||
| -rw-r--r-- | ishtar_common/templates/base.html | 3 | ||||
| -rw-r--r-- | ishtar_common/templates/blocks/DataTables.html | 2 |
5 files changed, 11 insertions, 0 deletions
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index ae032a8a4..eed484d5a 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -62,6 +62,7 @@ {% if item.number_of_finds_by_place %} <h4>{% trans "Finds by location in the warehouse" %}</h4> {% for items in item.number_of_finds_by_place %} +{% if items %} <table class='table table-striped datatables' id="{{window_id}}-find-by-loca-{{forloop.counter}}"> <thead> @@ -79,6 +80,7 @@ {% endfor %} </tbody> </table> +{% endif %} {% endfor %} {% endif %} @@ -91,6 +93,7 @@ {% if item.number_of_containers_by_place %} <h4>{% trans "Containers by location in the warehouse" %}</h4> {% for items in item.number_of_containers_by_place %} +{% if items %} <table class='table table-striped datatables' id="{{window_id}}-container-by-loca-{{forloop.counter}}"> <thead> @@ -108,6 +111,7 @@ {% endfor %} </tbody> </table> +{% endif %} {% endfor %} {% endif %} 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 %}<script type='text/javascript'> + debug = true; + </script>{% endif %} </head> <body data-spy="scroll" data-target="#window-fixed-menu"{% if current_theme%} id='{{current_theme}}'{%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); |