From 1a821179dbbaa1e8b13279f6bb163e5ef0310974 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Tue, 12 Oct 2021 18:06:14 +0300 Subject: [PATCH] Even more Fixes over dashboard's sorting --- .../main/java/eu/eudat/logic/managers/DashBoardManager.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java index 739a5f80d..29eb08cd4 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/DashBoardManager.java @@ -356,6 +356,9 @@ public class DashBoardManager { try { String order = tableRequest.getOrderings().getFields().get(0).toCharArray()[0] + ""; String field = tableRequest.getOrderings().getFields().get(0).substring(1); + if (field.contains(":") && field.contains("|")) { + field = field.substring(field.lastIndexOf(":") + 1, field.indexOf("|")); + } field = field.equals("label") ? "title" : field; field = field.substring(0, 1).toUpperCase() + field.substring(1); return (order.equals("+") ? 1 : -1 ) * ((Comparable)o1.getClass().getMethod("get" + field).invoke(o1)).compareTo(o2.getClass().getMethod("get" + field).invoke(o2));