java/code/src/com/redhat/rhn/frontend/action/user/BaseUserListSetupAction.java | 65 ---------- java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java | 42 +++++- java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp | 4 3 files changed, 40 insertions(+), 71 deletions(-)
New commits: commit d152d9402cf1bac5c0b9291f579735e944aef611 Author: Justin Sherrill jsherril@redhat.com Date: Thu May 13 13:54:25 2010 -0400
590204 - fixing issue where pagination wasnt working properly on normal user list page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/BaseUserListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/BaseUserListSetupAction.java deleted file mode 100644 index 062b38f..0000000 --- a/java/code/src/com/redhat/rhn/frontend/action/user/BaseUserListSetupAction.java +++ /dev/null @@ -1,65 +0,0 @@ -/** - * Copyright (c) 2009--2010 Red Hat, Inc. - * - * This software is licensed to you under the GNU General Public License, - * version 2 (GPLv2). There is NO WARRANTY for this software, express or - * implied, including the implied warranties of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 - * along with this software; if not, see - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. - * - * Red Hat trademarks are not licensed under GPLv2. No permission is - * granted to use or replicate Red Hat trademarks that are incorporated - * in this software or its documentation. - */ -package com.redhat.rhn.frontend.action.user; - -import com.redhat.rhn.common.db.datasource.DataResult; -import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.listview.PageControl; -import com.redhat.rhn.frontend.struts.RequestContext; -import com.redhat.rhn.frontend.struts.RhnListAction; - -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionForward; -import org.apache.struts.action.ActionMapping; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * BaseUserListSetupAction - * @version $Rev$ - */ -public abstract class BaseUserListSetupAction extends RhnListAction { - - /** {@inheritDoc} */ - public ActionForward execute(ActionMapping mapping, - ActionForm formIn, - HttpServletRequest request, - HttpServletResponse response) { - - RequestContext requestContext = new RequestContext(request); - - User user = requestContext.getLoggedInUser(); - PageControl pc = new PageControl(); - pc.setIndexData(true); - pc.setFilterColumn("loginUc"); - pc.setFilter(true); - - clampListBounds(pc, request, user); - - request.setAttribute("pageList", getDataResult(user, pc)); - request.setAttribute("parentUrl", request.getRequestURI()); - return mapping.findForward("default"); - } - - /** - * Returns the appropriate list of users - * @param user The logged in user - * @param pc The PageControl - * @return list of Users - */ - protected abstract DataResult getDataResult(User user, PageControl pc); - -} diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java index aab6ae0..cc33d84 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserListSetupAction.java @@ -16,17 +16,49 @@ package com.redhat.rhn.frontend.action.user;
import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.domain.user.User; -import com.redhat.rhn.frontend.listview.PageControl; +import com.redhat.rhn.frontend.struts.RequestContext; +import com.redhat.rhn.frontend.struts.RhnAction; +import com.redhat.rhn.frontend.struts.RhnHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper; +import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.user.UserManager;
+import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionForward; +import org.apache.struts.action.ActionMapping; + +import java.util.List; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * UserListSetupAction * @version $Rev$ */ -public class UserListSetupAction extends BaseUserListSetupAction { +public class UserListSetupAction extends RhnAction implements Listable { + + /** + * ${@inheritDoc} + */ + public ActionForward execute(ActionMapping mapping, ActionForm form, + HttpServletRequest request, HttpServletResponse response) throws Exception { + RequestContext context = new RequestContext(request); + User user = context.getLoggedInUser(); + ListHelper helper = new ListHelper(this, request); + helper.execute(); + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } +
- /** {@inheritDoc} */ - protected DataResult getDataResult(User user, PageControl pc) { - return UserManager.usersInOrg(user, pc); + /** + * + * {@inheritDoc} + */ + public List getResult(RequestContext context) { + User user = context.getLoggedInUser(); + DataResult dr = UserManager.usersInOrg(user, null); + dr.elaborate(); + return dr; } } diff --git a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp index 8e4d350..8148ad9 100644 --- a/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp +++ b/java/code/webapp/WEB-INF/pages/admin/users/userlist.jsp @@ -20,7 +20,7 @@ <c:set var="pageList" value="${requestScope.pageList}" />
<rl:listset name="userListSet"> - <rl:list dataset="pageList" + <rl:list width="100%" name="userList" styleclass="list" @@ -28,6 +28,8 @@ emptykey="activelist.jsp.noUsers" alphabarcolumn="userLogin"> + + <rl:column bound="false" sortable="true" headerkey="username.nopunc.displayname"