Merge branch 'ticket-testing' into 'master'
Datatable improvements: bigger uwsgi buffers, work for all tables See merge request LCA2018/symposion_app!58
This commit is contained in:
commit
3ee9c6ef4d
2 changed files with 7 additions and 7 deletions
|
@ -46,4 +46,4 @@ VOLUME /app/symposion_app
|
||||||
CMD ["./manage.py", "runserver", "-v3", "0.0.0.0:8000"]
|
CMD ["./manage.py", "runserver", "-v3", "0.0.0.0:8000"]
|
||||||
|
|
||||||
FROM symposion_base as symposion_prod
|
FROM symposion_base as symposion_prod
|
||||||
CMD ["/usr/local/bin/uwsgi", "--http-socket", "0.0.0.0:8000", "--wsgi-file", "pinaxcon/wsgi.py"]
|
CMD ["/usr/local/bin/uwsgi", "--http-socket", "0.0.0.0:8000", "-b", "8192", "--wsgi-file", "pinaxcon/wsgi.py"]
|
||||||
|
|
|
@ -49,12 +49,12 @@
|
||||||
<script src="{{ STATIC_URL }}datatables/js/dataTables.bootstrap.js" type="text/javascript"></script>
|
<script src="{{ STATIC_URL }}datatables/js/dataTables.bootstrap.js" type="text/javascript"></script>
|
||||||
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
|
<script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(function() {
|
$("table.table-reportdata").each(function () {
|
||||||
$("table.table-reportdata").dataTable({
|
$(this).dataTable({
|
||||||
"sDom": "<'row'<'col-md-3'l><'col-md-3'T><'col-md-4'f>r>t<'row'<'col-md-3'i><'col-md-5'p>>",
|
"sDom": "<'row'<'col-md-3'l><'col-md-3'T><'col-md-4'f>r>t<'row'<'col-md-3'i><'col-md-5'p>>",
|
||||||
"sPaginationType": "bootstrap",
|
"sPaginationType": "bootstrap",
|
||||||
"aLengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]],
|
|
||||||
"bStateSave": true,
|
"bStateSave": true,
|
||||||
|
"aLengthMenu": [[10, 50, 100, -1], [10, 50, 100, "All"]],
|
||||||
"oTableTools": {
|
"oTableTools": {
|
||||||
"aButtons": [
|
"aButtons": [
|
||||||
"copy",
|
"copy",
|
||||||
|
@ -63,7 +63,7 @@
|
||||||
],
|
],
|
||||||
"sSwfPath": "{{ STATIC_URL }}tabletools/swf/copy_csv_xls.swf"
|
"sSwfPath": "{{ STATIC_URL }}tabletools/swf/copy_csv_xls.swf"
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
Loading…
Reference in a new issue