[portal-commits] JBoss Portal SVN: r12780 - branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/admin.
Author: prabhat.jha(a)jboss.com
Date: 2009-02-05 11:50:47 -0500 (Thu, 05 Feb 2009)
New Revision: 12780
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
Log:
JBPORTAL-2297 It works with the fix. Wont mind having 2nd pair of eyes take a look.
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2009-02-05
12:41:35 UTC (rev 12779)
+++
branches/JBoss_Portal_Branch_2_7/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2009-02-05
16:50:47 UTC (rev 12780)
@@ -108,6 +108,8 @@
/** The decoder. */
private static final FastURLDecoder decoder = FastURLDecoder.getUTF8Instance();
+
+ private boolean isNewSearch=true;
public UserAdministrationBean()
{
@@ -239,9 +241,20 @@
{
try
{
- int intLimit = Integer.valueOf(limit).intValue();
- int offset = page > 0 ? ((page - 1) * intLimit) : 0;
- int limit1 = intLimit + 1;
+
+ int initLimit = Integer.valueOf(limit).intValue();
+ int offset = 0;
+ if(!isNewSearch)
+ {
+ offset = page > 0 ? ((page - 1) * initLimit) : 0;
+ isNewSearch = true;
+ }
+
+ else
+ page = 1;
+
+
+ int limit1 = initLimit + 1;
this.userList = new
ListDataModel(identityUserBean.findUsersFilteredByUserName(searchString, offset,
limit1));
}
catch (Exception e)
@@ -386,6 +399,7 @@
public String nextPage()
{
+ isNewSearch = false;
this.page++;
this.searchUsers();
return "searchUsers";
@@ -393,6 +407,7 @@
public String prevPage()
{
+ isNewSearch = false;
this.page--;
this.searchUsers();
return "searchUsers";