Merge pull request #1662 from int2001/dtable_hamsat_fix

assets/js/sections/hamsat.js

@@ -49,7 +49,7 @@ function configureButton(rowLength) {
 
 function loadActivationsTable(rows, show_workable_only) {
 	var uninitialized = $('#activationsList').filter(function() {
-		if ($.fn.DataTable.fnIsDataTable(this)) {
+		if ($.fn.DataTable.isDataTable(this)) {
 			return false;
 		} else {
 			configureButton(rows.length);
@@ -68,14 +68,23 @@ function loadActivationsTable(rows, show_workable_only) {
 		$.fn.dataTable.moment(custom_date_format);
 		$(this).DataTable({
 			"pageLength": 25,
-			"columnDefs": [{
-				"targets": [8, 9, 10], "orderable": false
-		}],	
+			"columnDefs": [
+				{
+				"defaultContent": "-",
+				"targets": "_all"
+				},{
+				"targets": [8, 9, 10],
+				"orderable": false
+				}
+			],	
 			searching: true,
 			responsive: false,
 			ordering: true,
 			"scrollY": window.innerHeight - $('#searchForm').innerHeight() - 250,
 			"scrollCollapse": true,
+			createdRow: function (row, data, dataIndex) {
+				$(row).attr('id',data.id);
+			},
 			"language": {
 				url: getDataTablesLanguageUrl(),
 			},
@@ -171,10 +180,9 @@ function loadActivationsTable(rows, show_workable_only) {
 		} else {
 			data.push('');
 		}
-
+		data.id='activationID-' + activation.id;
 		let createdRow = table.row.add(data).index();
 		table.rows(createdRow).nodes().to$().data('activationID', activation.id);
-		table.row(createdRow).node().id = 'activationID-' + activation.id;
 	}
 	table.draw();
 	$('[data-bs-toggle="tooltip"]').tooltip();