diff --git a/frontend-js/src/main/js/GuiConnector.js b/frontend-js/src/main/js/GuiConnector.js index 9b5189af4a1bba46bca7ace7be2b5af27a6a5027..9dbb207b8d3b6e0f83e942d549fd6e9403bc5a8a 100644 --- a/frontend-js/src/main/js/GuiConnector.js +++ b/frontend-js/src/main/js/GuiConnector.js @@ -106,6 +106,13 @@ GuiConnector.prototype.init = function () { }; } newUrl = ""; + + //sorting of datatable column by input value https://stackoverflow.com/a/29221907/1127920 + $.fn.dataTable.ext.order['dom-input'] = function (settings, col) { + return this.api().column(col, {order: 'index'}).nodes().map(function (td, i) { + return $('input', td).val(); + }); + } }; diff --git a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js index 7fe796baa20e73c56e50ac72ea702a98353d7cf2..a140ba353016950dfb31f29058ebc563530cf667 100644 --- a/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js +++ b/frontend-js/src/main/js/gui/admin/CommentsAdminPanel.js @@ -61,7 +61,8 @@ CommentsAdminPanel.prototype._createGui = function () { }, { title: 'Content' }, { - title: 'Removed' + title: 'Removed', + orderable: false }, { title: 'Pinned' }] diff --git a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js index 1f6cc6d1eeb6ab637e1222e3e782d1a1f4451a90..b21faa4fabc51d873cbe8da0acf4068ce4b33486 100644 --- a/frontend-js/src/main/js/gui/admin/EditProjectDialog.js +++ b/frontend-js/src/main/js/gui/admin/EditProjectDialog.js @@ -325,13 +325,17 @@ EditProjectDialog.prototype._createMapsTable = function () { }, { title: 'Name' }, { - title: 'Default center x' + title: 'Default center x', + orderable: false }, { - title: 'Default center y' + title: 'Default center y', + orderable: false }, { - title: 'Default zoom level' + title: 'Default zoom level', + orderable: false }, { - title: 'Update' + title: 'Update', + orderable: false }] }); @@ -397,18 +401,31 @@ EditProjectDialog.prototype._createOverlayTable = function () { }, { title: 'Description' }, { - title: 'Public' + title: 'Public', + orderable: false }, { - title: 'Default' + title: 'Default', + orderable: false }, { - title: 'Owner' + title: 'Owner', + orderable: false }, { - title: 'Data' + title: 'Data', + orderable: false }, { - title: 'Update' + title: 'Update', + orderable: false }, { - title: 'Remove' + title: 'Remove', + orderable: false }], + columnDefs: [ + { + orderDataType: "dom-input", + type: "string", + targets: [1, 2] + } + ], dom: '<"minerva-datatable-toolbar">frtip', initComplete: function () { $("div.minerva-datatable-toolbar", $(result)).html('<button name="addOverlay">Add overlay</button>'); @@ -437,7 +454,7 @@ EditProjectDialog.prototype._createOverlayTable = function () { var button = this; return self.getServerConnector().getOverlaySourceDownloadUrl({ overlayId: $(button).attr("data"), - projectId:self.getProject().getProjectId() + projectId: self.getProject().getProjectId() }).then(function (url) { return self.downloadFile(url); }).then(null, GuiConnector.alert); @@ -622,7 +639,8 @@ EditProjectDialog.prototype.initUsersTab = function () { var columns = self.createUserPrivilegeColumns(); $(usersTable).DataTable({ - columns: columns + columns: columns, + ordering: false }); return Promise.resolve(); };