Commit cb056fa6 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '895-admin-panel-columns-sorting' into 'master'

Resolve "Admin panel columns sorting"

Closes #895

See merge request !893
parents a54fa7bb d6f32a29
Pipeline #12978 passed with stage
in 12 minutes and 36 seconds
......@@ -6,6 +6,8 @@ minerva (14.0.0~beta.0) unstable; urgency=low
check logs (#894)
* Bug fix: user without admin or curator privileges had issues with accesing
and removing data overlays (#897, #898, #899, #903)
* Small improvement: sorting by columns that doesn't make sense in admin panel
is disabled (#895)
-- Piotr Gawron <piotr.gawron@uni.lu> Mon, 21 Aug 2019 21:00:00 +0200
......
......@@ -121,7 +121,10 @@ ConfigurationAdminPanel.prototype.createOptionsTable = function (options, type)
}, {
title: 'Value'
}],
order: [[1, "asc"]]
columnDefs: [
{"orderable": false, "targets": 1}
],
order: [[0, "asc"]]
});
var data = [];
......
......@@ -139,7 +139,10 @@ MapsAdminPanel.prototype._createProjectTableRow = function () {
title: 'Edit'
}, {
title: 'Remove'
}]
}],
columnDefs: [
{"orderable": false, "targets": [6, 7]}
]
});
self.bindUserGuiPreference({
jQueryObject: $(projectsTable),
......
......@@ -131,7 +131,10 @@ UsersAdminPanel.prototype._createUsersTableRow = function () {
title: 'Edit'
}, {
title: 'Remove'
}]
}],
columnDefs: [
{"orderable": false, "targets": [5, 6]}
]
});
self.bindUserGuiPreference({
......@@ -303,7 +306,7 @@ UsersAdminPanel.prototype.addUpdateListener = function (user, dataTableRow) {
var listener = function () {
var login = Functions.escapeSelector(user.getLogin());
self.userToTableRow(user, dataTableRow);
var dataTable =$("[name='usersTable']", self.getElement()).DataTable();
var dataTable = $("[name='usersTable']", self.getElement()).DataTable();
var row = dataTable.row("#" + login);
if (row.length > 0) {
var page = dataTable.page();
......
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