Skip to content

Fix compatibility with Datatables 2 and mapbender 4.2.5 #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Phocacius wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compatibility with Datatables 2 and mapbender 4.2.5 #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3b553e
Fix refreshLayersAfterFeatureSave with Mapbender 4.2.5
Phocacius Feb 24, 2026
11139e2
Fix adding rows in new datatables version
Phocacius Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/Mapbender/DataManagerBundle/Resources/public/TableRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,13 @@
*/
showRow: function(tr) {
var dt = this.getDatatablesInstance_();
// NOTE: current dataTables versions could just do dt.row(tr).show().draw(false)
// TODO v5: check can be removed in next major upgrade
if ($.fn.DataTable.versionCheck('2.0')) {
// redraw table
return dt.draw(false);
}

// in older versions, automatic pagination after adding a row was not available
var rowIndex = dt.rows({order: 'current'}).nodes().indexOf(tr);
var pageLength = dt.page.len();
var rowPage = Math.floor(rowIndex / pageLength);
Expand Down
14 changes: 10 additions & 4 deletions src/Mapbender/DigitizerBundle/Resources/public/mapbender.element.digitizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,14 +773,20 @@
sourceIds = [sourceIds];
}
for (var i = 0; i < sourceIds.length; ++i) {
var source = this.mbMap.getModel().getSourceById(sourceIds[i]);
const model = this.mbMap.getModel();
// TODO v5: remove check. model.getSourceBySourceId is available since Mapbender 4.2.5
let source = typeof model.getSourceBySourceId === 'function'
? model.getSourceBySourceId(sourceIds[i])
: model.getSourceById(sourceIds[i]);

if (!source) {
if (!this.mbMap.getModel().findSourceAndLayerIdByName) {
// TODO v5: remove fallback.
if (!model.findSourceAndLayerIdByName) {
console.warn("Method findSourceAndLayerIdByName not available - consider Mapbender upgrade");
} else {
let ids = this.mbMap.getModel().findSourceAndLayerIdByName(sourceIds[i]);
let ids = model.findSourceAndLayerIdByName(sourceIds[i]);
let sourceId = ids.sourceId;
source = sourceId && this.mbMap.getModel().getSourceById(sourceId);
source = sourceId && model.getSourceById(sourceId);
}
}
if (source) {
Expand Down