Skip to content

Commit

Permalink
Adapt code after updating DataTables from 1.10.16 to 1.10.18
Browse files Browse the repository at this point in the history
The `row()` function (used to select as single row from a table) now
returns an empty list when a `td`-element is passed. This change passes the
according `tr`-element instead which still works.

See https://progress.opensuse.org/issues/153427
  • Loading branch information
Martchus committed Feb 12, 2024
1 parent b48e043 commit 83af246
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions assets/javascripts/admintable.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function setEditingAdminTableRow(tdElement, editing, submitted) {
// get the data table row for the tdElement
var adminTable = window.adminTable;
var rowData = adminTable.rowData;
var row = adminTable.row(tdElement);
var row = adminTable.row(tdElement.parentElement);
if (!row) {
addFlash('danger', 'Internal error: invalid table row/cell specified');
return;
Expand All @@ -80,7 +80,7 @@ function setEditingAdminTableRow(tdElement, editing, submitted) {
}

function refreshAdminTableRow(tdElement) {
window.adminTable.row(tdElement).invalidate().draw();
window.adminTable.row(tdElement.parentElement).invalidate().draw();
}

function handleAdminTableApiError(request, status, error) {
Expand Down Expand Up @@ -114,7 +114,7 @@ function handleAdminTableSubmit(tdElement, response, id) {
}

var adminTable = window.adminTable;
var row = adminTable.row(tdElement);
var row = adminTable.row(tdElement.parentElement);
var rowIndex = row.index();
if (rowIndex >= adminTable.rowData.length) {
return;
Expand Down Expand Up @@ -198,7 +198,7 @@ function getAdminTableRowData(trElement, dataToSubmit, internalRowData) {

function submitAdminTableRow(tdElement, id) {
var adminTable = window.adminTable;
var rowIndex = adminTable.row(tdElement).index();
var rowIndex = adminTable.row(tdElement.parentElement).index();
if (rowIndex === undefined) {
addFlash('danger', 'Internal error: invalid table cell specified');
return;
Expand Down Expand Up @@ -253,7 +253,7 @@ function submitAdminTableRow(tdElement, id) {

function removeAdminTableRow(tdElement) {
var adminTable = window.adminTable;
var row = adminTable.row(tdElement);
var row = adminTable.row(tdElement.parentElement);
var rowIndex = row.index();
if (rowIndex !== undefined && rowIndex < adminTable.rowData.length) {
adminTable.rowData.splice(rowIndex, 1);
Expand Down
2 changes: 1 addition & 1 deletion assets/javascripts/audit_log.js
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ function loadAuditLogTable() {
var scheduledProductsTable;

function dataForLink(link) {
const rowData = scheduledProductsTable.row(link.parentNode).data();
const rowData = scheduledProductsTable.row(link.parentElement?.parentElement).data();
if (rowData === undefined) {
console.error('unable to find row data for action link');
}
Expand Down

0 comments on commit 83af246

Please sign in to comment.