diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index 5394a986..65edc7c8 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -28,6 +28,16 @@ history_table_options = { "order": [ 1, 'desc'], "autoWidth": false, "columnDefs": [ + { + "targets": [0], + "data": null, + "createdCell": function (td, cellData, rowData, row, col) { + $(td).html(''); + }, + "className": "delete-control no-wrap hidden", + "searchable": false, + "orderable": false + }, { "targets": [1], "data":"date", @@ -175,16 +185,6 @@ history_table_options = { "className": "no-wrap hidden-md hidden-sm hidden-xs", "width": "10px" }, - { - "targets": [0], - "data": null, - "createdCell": function (td, cellData, rowData, row, col) { - $(td).html(''); - }, - "className": "delete-control no-wrap hidden", - "searchable": false, - "orderable": false - }, ], "drawCallback": function (settings) { // Jump to top of page @@ -247,13 +247,13 @@ $('#history_table').on('click', 'td.modal-control-ip', function () { getUserLocation(rowData['ip_address']); }); -$('#history_table').on('click', 'td.delete-control', function () { +$('#history_table').on('click', 'td.delete-control > button', function () { var tr = $(this).parents('tr'); var row = history_table.row( tr ); var rowData = row.data(); - $(this).children("button").prop('disabled', true); - $(this).children("button").html(' Delete'); + $(this).prop('disabled', true); + $(this).html(' Delete'); $.ajax({ url: 'delete_history_rows',