Index: lams_admin/web/usersearchlist.jsp =================================================================== diff -u -rf0068567e57c2d2da0ebdc6cd43091d564d3b493 -rcc749ec17c54066bccb3daa61c5d5478720b32b6 --- lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision f0068567e57c2d2da0ebdc6cd43091d564d3b493) +++ lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision cc749ec17c54066bccb3daa61c5d5478720b32b6) @@ -149,7 +149,7 @@
+ |
|
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java =================================================================== diff -u -raa6023fdecba00eb9a7df76e834e681f7d58462d -rcc749ec17c54066bccb3daa61c5d5478720b32b6 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java (.../UserDAO.java) (revision aa6023fdecba00eb9a7df76e834e681f7d58462d) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java (.../UserDAO.java) (revision cc749ec17c54066bccb3daa61c5d5478720b32b6) @@ -24,13 +24,25 @@ // support for custom search from a toolbar GET_USERS = addNameSearch(GET_USERS, searchString); //order by - GET_USERS += " ORDER BY CASE " + " WHEN :sortBy='userId' THEN user.userId " - + " WHEN :sortBy='login' THEN user.login " + " WHEN :sortBy='firstName' THEN user.firstName " - + " WHEN :sortBy='lastName' THEN user.lastName " + " WHEN :sortBy='email' THEN user.email " + " END " - + sortOrder; + if ("userId".equals(sortBy)) { + sortBy = "user.userId + 0"; + } else if ("login".equals(sortBy)) { + sortBy = "user.login"; + + } else if ("firstName".equals(sortBy)) { + sortBy = "user.firstName"; + + } else if ("lastName".equals(sortBy)) { + sortBy = "user.lastName"; + + } else if ("email".equals(sortBy)) { + sortBy = "user.email"; + + } + GET_USERS += " ORDER BY " + sortBy + " " + sortOrder; + Query query = getSession().createQuery(GET_USERS); - query.setString("sortBy", sortBy); query.setFirstResult(page * size); query.setMaxResults(size); List |
---|