From 7c1a00aeec473f414c5168fc1d8922c402461c2e Mon Sep 17 00:00:00 2001
From: Tom Vahlman <tom@dsv.su.se>
Date: Fri, 6 Apr 2012 14:15:50 +0200
Subject: [PATCH] implemented sorting Employees based on keyword counts for the
Regular and Area columns in the Statistics panel.
---
.../admin/panels/match/AdminSupervisorKeywordPanel.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java
index e922dccb41..e43d5626a0 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java
@@ -131,9 +131,7 @@ if(!supervisorName.toString().isEmpty()) {
@Override
protected List<Employee> load() {
org.springframework.data.domain.Sort sorter;
- if (sortDirection.toString().isEmpty()) {
- sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.ASC, "user.lastName");
- } else if (sortDirection.toString().equals("ASC")) {
+ if (sortDirection.toString().isEmpty() || sortDirection.toString().equals("ASC")) {
sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.ASC, "user.lastName");
} else {
sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, "user.lastName");