Don't try to initialise dataTable twice

Old code was initialising the dataTable twice - once in the parent
block and once in the child. This doesn't actually work and just
caused errors.

Switch to only initializing it once. Unfortunately this creates
copy-pasta :(
This commit is contained in:
James Polley 2017-12-03 17:30:43 +11:00
parent 3239bbe29a
commit c7e29b3cb1

View file

@ -85,7 +85,10 @@
{% endblock %} {% endblock %}
{% block extra_script %} {% block extra_script %}
{{ block.super }} <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-colvis-1.4.2/b-flash-1.4.2/b-html5-1.4.2/b-print-1.4.2/cr-1.4.1/fc-3.2.3/fh-3.1.3/r-2.2.0/rg-1.0.2/datatables.min.css"/>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/pdfmake.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/v/bs/jszip-2.5.0/dt-1.10.16/b-1.4.2/b-colvis-1.4.2/b-html5-1.4.2/b-print-1.4.2/cr-1.4.1/fc-3.2.3/fh-3.1.3/r-2.2.0/rg-1.0.2/datatables.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
(function($) { (function($) {
$.fn.actions = function(opts) { $.fn.actions = function(opts) {
@ -155,9 +158,29 @@
$("tr input.action-select").actions(); $("tr input.action-select").actions();
}); });
$('.dataTable').dataTable({ $('.dataTable').dataTable({
"drawCallback": function( settings ) { "dom": "<'row'<'col-md-3'l><'col-md-3'B><'col-md-4'f>r>t<'row'<'col-md-3'i><'col-md-5'p>>",
$("tr input.action-select").actions(); "stateSave": true,
} "lengthMenu": [[10, 50, 100, -1], [10, 50, 100, "All"]],
}); "drawCallback": function( settings ) {
$("tr input.action-select").actions();
},
"pageLength": 100,
"colReorder": true,
"buttons": [ {
extend: 'collection',
text: 'Export',
buttons: ["copy", "csv", "print"]
},
{ extend: 'collection',
text: 'Columns',
buttons: [
{ extend: 'columnsToggle',
columns: '.toggle' },
{ extend: 'columnToggle',
text: 'Vote details',
columns: '.votes'
}
]
}]});
</script> </script>
{% endblock %} {% endblock %}