From 6c923eda6fdb9230d9d85506fdff18fdc15e4b93 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 21 Mar 2018 17:26:55 +0100
Subject: [PATCH] fix on refreshing data (page wasn't persisted)
---
frontend-js/src/main/js/gui/admin/MapsAdminPanel.js | 11 ++++-------
frontend-js/src/main/js/gui/admin/UsersAdminPanel.js | 4 ++--
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
index 49977c5f06..a4a16ac1e5 100644
--- a/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/MapsAdminPanel.js
@@ -91,11 +91,7 @@ MapsAdminPanel.prototype._createProjectTableRow = function () {
});
projectsRow.appendChild(projectsTable);
- // noinspection JSUnusedGlobalSymbols
$(projectsTable).DataTable({
- fnRowCallback: function (nRow, aData) {
- nRow.setAttribute('id', aData[0]);
- },
columns: [{
title: 'ProjectId'
}, {
@@ -202,17 +198,18 @@ MapsAdminPanel.prototype.getHtmlStringLink = function (annotation) {
MapsAdminPanel.prototype.setProjects = function (projects) {
var self = this;
- var dataTable = $($("[name='projectsTable']", self.getElement())[0]).DataTable();
+ var dataTable = $("[name='projectsTable']", self.getElement()).DataTable();
var data = [];
var page = dataTable.page();
+
for (var i = 0; i < projects.length; i++) {
var project = projects[i];
var rowData = self.projectToTableRow(project);
self.addUpdateListener(project, rowData);
data.push(rowData);
}
- dataTable.clear().rows.add(data).draw();
- dataTable.page(page).draw(false);
+ //it should be simplified, but I couldn't make it work
+ dataTable.clear().rows.add(data).page(page).draw(false).page(page).draw(false);
};
MapsAdminPanel.prototype.addUpdateListener = function (project, dataTableRow) {
diff --git a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
index b046e0a9ec..beda57f73a 100644
--- a/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
+++ b/frontend-js/src/main/js/gui/admin/UsersAdminPanel.js
@@ -197,8 +197,8 @@ UsersAdminPanel.prototype.setUsers = function (users) {
self.addUpdateListener(user, rowData);
data.push(rowData);
}
- dataTable.clear().rows.add(data).draw();
- dataTable.page(page).draw(false);
+ //it should be simplified, but I couldn't make it work
+ dataTable.clear().rows.add(data).page(page).draw(false).page(page).draw(false);
};
--
GitLab