Commit 3e5f3475 authored by Piotr Gawron's avatar Piotr Gawron

Merge branch '909-edit-project-user' into 'devel_13.2.x'

Resolve "Edit project/user comes back to the 1st page // MIN 13.1.3"

See merge request !924
parents 8d7f95af 78d1ccc5
Pipeline #13388 passed with stages
in 19 minutes and 14 seconds
...@@ -3,10 +3,12 @@ minerva (13.2.0) stable; urgency=medium ...@@ -3,10 +3,12 @@ minerva (13.2.0) stable; urgency=medium
PredictProtein (#913) PredictProtein (#913)
* Bug fix: search by drugs didn't check synonyms in chembl database * Bug fix: search by drugs didn't check synonyms in chembl database
* Bug fix: verification of overlay type added (#917) * Bug fix: verification of overlay type added (#917)
* Bug fix: opening edit project/user dialog returned list of users/projects
to the 1st page (#909)
* Bug fix: show element title option wasn't influencing title visibility * Bug fix: show element title option wasn't influencing title visibility
(#910) (#910)
-- Piotr Gawron <piotr.gawron@uni.lu> Wed, 21 Aug 2019 17:00:00 +0200 -- Piotr Gawron <piotr.gawron@uni.lu> Thu, 29 Aug 2019 17:00:00 +0200
minerva (13.1.3) stable; urgency=medium minerva (13.1.3) stable; urgency=medium
* Bug fix: refreshing list of projects or list of users doesn't change active * Bug fix: refreshing list of projects or list of users doesn't change active
......
...@@ -332,11 +332,11 @@ MapsAdminPanel.prototype.addUpdateListener = function (project) { ...@@ -332,11 +332,11 @@ MapsAdminPanel.prototype.addUpdateListener = function (project) {
for (var i = 0; i < length; i++) { for (var i = 0; i < length; i++) {
var row = dataTable.row(i); var row = dataTable.row(i);
var data = row.data(); var data = row.data();
if (data[0].indexOf(">" + project.getProjectId() + "<")>=0) { if (data[0].indexOf(">" + project.getProjectId() + "<") >= 0) {
self.projectToTableRow(project, data, user); self.projectToTableRow(project, data, user);
var page = dataTable.page(); var page = dataTable.page();
row.data(data).draw(); row.data(data).draw();
dataTable.page(page); dataTable.page(page).draw(false);
} }
} }
}); });
......
...@@ -306,7 +306,7 @@ UsersAdminPanel.prototype.addUpdateListener = function (user, dataTableRow) { ...@@ -306,7 +306,7 @@ UsersAdminPanel.prototype.addUpdateListener = function (user, dataTableRow) {
if (row.length > 0) { if (row.length > 0) {
var page = dataTable.page(); var page = dataTable.page();
row.data(dataTableRow).draw(); row.data(dataTableRow).draw();
dataTable.page(page); dataTable.page(page).draw(false);
} }
}; };
listener.listenerName = listenerName; listener.listenerName = listenerName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment