Merge remote-tracking branch 'chinkung/master'

This commit is contained in:
Khanh Ngo 2018-04-18 11:55:50 +07:00
commit 45b8c0c12b
3 changed files with 20 additions and 2 deletions

View File

@ -68,7 +68,15 @@
"searching" : true,
"ordering" : true,
"info" : true,
"autoWidth" : false
"autoWidth" : false,
"columnDefs": [
{
"render": function ( data, type, row ) {
return moment.utc(data).local().format('YYYY-MM-DD HH:mm:ss');
},
"targets": 2
}
]
});
$(document.body).on('click', '.history-info-button', function() {
var modal = $("#modal_history_info");

View File

@ -188,6 +188,8 @@
<script src="{{ url_for('static', filename='adminlte2/plugins/iCheck/icheck.min.js') }}"></script>
<!-- FastClick -->
<script src="{{ url_for('static', filename='adminlte2/plugins/fastclick/fastclick.js') }}"></script>
<!-- Moment.js -->
<script src="{{ url_for('static', filename='adminlte2/plugins/daterangepicker/moment.min.js') }}"></script>
<!-- AdminLTE App -->
<script src="{{ url_for('static', filename='adminlte2/dist/js/app.min.js') }}"></script>
<!-- Multiselect -->

View File

@ -162,7 +162,15 @@
"searching" : false,
"ordering" : false,
"info" : false,
"autoWidth" : false
"autoWidth" : false,
"columnDefs": [
{
"render": function ( data, type, row ) {
return moment.utc(data).local().format('YYYY-MM-DD HH:mm:ss');
},
"targets": 2
}
]
});
// set up domain list
$("#tbl_domain_list").DataTable({