Index: lams_admin/conf/xdoclet/struts-forms.xml =================================================================== diff -u -r7248fb9335792be231dcc498f37b28ffa0c794dc -r301b444dedf83e9caa28a69f3d70b84942181052 --- lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 7248fb9335792be231dcc498f37b28ffa0c794dc) +++ lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 301b444dedf83e9caa28a69f3d70b84942181052) @@ -50,13 +50,9 @@ - - - - + - Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java =================================================================== diff -u -r336014c7cec33723726010231bde33206bda4cb1 -r301b444dedf83e9caa28a69f3d70b84942181052 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java (.../UserSearchAction.java) (revision 336014c7cec33723726010231bde33206bda4cb1) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java (.../UserSearchAction.java) (revision 301b444dedf83e9caa28a69f3d70b84942181052) @@ -44,7 +44,7 @@ import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.util.MessageService; /** * @author jliew @@ -67,13 +67,19 @@ private static Logger log = Logger.getLogger(UserSearchAction.class); private static IUserManagementService service; + private static MessageService messageService; public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { - service = AdminServiceProxy.getService(getServlet().getServletContext()); + if (service == null) { + service = AdminServiceProxy.getService(getServlet().getServletContext()); + } + if (messageService == null) { + messageService = AdminServiceProxy.getMessageService(getServlet().getServletContext()); + } DynaActionForm userSearchForm = (DynaActionForm)form; if(!(request.isUserInRole(Role.SYSADMIN) || service.isUserGlobalGroupAdmin())){ @@ -85,89 +91,34 @@ return mapping.findForward("usersearchlist"); } - String userId = ((String)userSearchForm.get("sUserId")).trim(); - String login = ((String)userSearchForm.get("sLogin")).trim(); - String firstName = ((String)userSearchForm.get("sFirstName")).trim(); - String lastName = ((String)userSearchForm.get("sLastName")).trim(); Boolean showAll = (Boolean)userSearchForm.get("showAll"); Boolean searched = (Boolean)userSearchForm.get("searched"); - String resultsSection = ((String)userSearchForm.get("resultsSection")).trim(); - //Integer sort = WebUtil.readIntParam(request,"sort",true); - Integer start = WebUtil.readIntParam(request,"start",true); + String term = ((String)userSearchForm.getString("term")).trim(); - // if start is set, we're returning a subset of a previous set of results; use the old search terms - if (start!=null) { - userId = WebUtil.readStrParam(request, "uid", true); - login = WebUtil.readStrParam(request, "l", true); - firstName = WebUtil.readStrParam(request, "fn", true); - lastName = WebUtil.readStrParam(request, "ln", true); - showAll = WebUtil.readBooleanParam(request, "sa"); - resultsSection = WebUtil.readStrParam(request, "rs", true); - searched = true; - } - - log.debug("got userId: '"+userId+"'"); - log.debug("got login: '"+login+"'"); - log.debug("got firstName: '"+firstName+"'"); - log.debug("got lastName: '"+lastName+"'"); - - List userList = new ArrayList(); - if (showAll) { - userList = service.findAll(User.class); - } else { - if (userId.length()==0) { - Map stringProperties = new HashMap(); - if(login.length()>0) stringProperties.put("login","%"+login+"%"); - if(firstName.length()>0) stringProperties.put("firstName","%"+firstName+"%"); - if(lastName.length()>0) stringProperties.put("lastName","%"+lastName+"%"); - if(!stringProperties.isEmpty()) userList = service.searchByStringProperties(User.class,stringProperties); - } else { + if (searched) { + List userList = new ArrayList(); + if (showAll) { Map objectProperties = new HashMap(); - objectProperties.put("userId",userId); - if(login.length()>0) objectProperties.put("login",login); - if(firstName.length()>0) objectProperties.put("firstName",firstName); - if(lastName.length()>0) objectProperties.put("lastName",lastName); - if(!objectProperties.isEmpty()) userList = service.findByProperties(User.class,objectProperties); + objectProperties.put("disabledFlag",false); + userList = service.findByProperties(User.class,objectProperties); + } else { + userList = service.searchUserSingleTerm(term); } - } - - if (searched) { if (userList.isEmpty()) { ActionMessages messages = new ActionMessages(); messages.add("results",new ActionMessage("msg.results.none")); saveMessages(request,messages); - } else { - userList = removeDisabledUsers(userList); - /*if (start!=null && start @@ -182,7 +182,7 @@
- +
Index: lams_admin/web/userlist.jsp =================================================================== diff -u -r0b6db83598ca1fccc7a8da8bd0320d82dbed3c75 -r301b444dedf83e9caa28a69f3d70b84942181052 --- lams_admin/web/userlist.jsp (.../userlist.jsp) (revision 0b6db83598ca1fccc7a8da8bd0320d82dbed3c75) +++ lams_admin/web/userlist.jsp (.../userlist.jsp) (revision 301b444dedf83e9caa28a69f3d70b84942181052) @@ -6,7 +6,8 @@ @@ -98,7 +99,7 @@

-
Id
+
Index: lams_admin/web/usersearchlist.jsp =================================================================== diff -u -r7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a -r301b444dedf83e9caa28a69f3d70b84942181052 --- lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision 7ab9e2377fd1ff4c3c5554bd1f6dffe3384f6f9a) +++ lams_admin/web/usersearchlist.jsp (.../usersearchlist.jsp) (revision 301b444dedf83e9caa28a69f3d70b84942181052) @@ -1,69 +1,75 @@ <%@ include file="/taglibs.jsp"%> + + +

- - + + +
- - + + - -

- -

+
-
+ +

+ +

+
+ + + + + + + + + + + +
: 
: 
+ +
+ + +

+ + + + + - - - - - - - - - - - - - - + + + - - - - + + - - - +
-      - - 10 - 20 - 30 - 40 - 50 - All -   -
- - -
users found.
@@ -78,6 +84,9 @@ + + ">   "> @@ -86,27 +95,30 @@
- -   - - - - - - - - - - - ">  - - -
- + + +
+ +
+ + + + + + + + +
+ \ No newline at end of file Index: lams_central/web/css/defaultHTML_learner.css =================================================================== diff -u -ra5c169485427ad83d9af77b91580640e02723a79 -r301b444dedf83e9caa28a69f3d70b84942181052 --- lams_central/web/css/defaultHTML_learner.css (.../defaultHTML_learner.css) (revision a5c169485427ad83d9af77b91580640e02723a79) +++ lams_central/web/css/defaultHTML_learner.css (.../defaultHTML_learner.css) (revision 301b444dedf83e9caa28a69f3d70b84942181052) @@ -130,8 +130,28 @@ } /* jquery tablesorter pager plugin */ -table.alternative-color thead tr .header { - background-color: #e6eeee; +table.tablesorter-admin td { + text-align: center; + padding:5px; + padding-left: 20px; + font-size: 11px; + border-bottom: 1px solid #efefef; + vertical-align: top; + background:url('../images/css/greyfade_bg.jpg') repeat-x 3px 0px +} + +table.tablesorter-admin th { + background-color: #e7f3cf; + height: 30px; + color: #47bc23; + padding-left: 15px; + border-top: 1px solid #cacdd1; + border-left: 1px solid #cacdd1; + border-right: 1px solid #fff; + font-size: 12px; +} + +table.tablesorter-admin thead tr .header { background-image: url(../images/css/bg.gif); background-repeat: no-repeat; background-position: center right; @@ -140,11 +160,11 @@ padding-right: 15px; } -table.alternative-color thead tr .headerSortUp { +table.tablesorter-admin thead tr .headerSortUp { background-image: url(../images/css/asc.gif); } -table.alternative-color thead tr .headerSortDown { +table.tablesorter-admin thead tr .headerSortDown { background-image: url(../images/css/desc.gif); }