[gatein-commits] gatein SVN: r3985 - exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
Author: hoang_to
Date: 2010-08-31 14:24:04 -0400 (Tue, 31 Aug 2010)
New Revision: 3985
Modified:
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java
Log:
EXOGTN-54: Exception after deleting last member of last page in the Group list
Modified:
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java
===================================================================
---
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java 2010-08-31
17:23:13 UTC (rev 3984)
+++
exo/portal/branches/3.1.x/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java 2010-08-31
18:24:04 UTC (rev 3985)
@@ -176,6 +176,10 @@
}
/** Reset the selected page index **/
+ if (backupPageIndex > pageIterator.getAvailablePage())
+ {
+ backupPageIndex = pageIterator.getAvailablePage();
+ }
pageIterator.setCurrentPage(backupPageIndex);
}
@@ -197,15 +201,10 @@
{
UIUserInGroup uiUserInGroup = event.getSource();
String id = event.getRequestContext().getRequestParameter(OBJECTID);
- UIPageIterator pageIterator =
uiUserInGroup.getChild(UIGridUser.class).getUIPageIterator();
- int currentPage = pageIterator.getCurrentPage();
OrganizationService service =
uiUserInGroup.getApplicationComponent(OrganizationService.class);
MembershipHandler handler = service.getMembershipHandler();
handler.removeMembership(id, true);
uiUserInGroup.refresh();
- while (currentPage > pageIterator.getAvailablePage())
- currentPage--;
- pageIterator.setCurrentPage(currentPage);
event.getRequestContext().addUIComponentToUpdateByAjax(uiUserInGroup.getChild(UIGridUser.class));
}
}