[portal-commits] JBoss Portal SVN: r13596 - in branches/Enterprise_Portal_Platform_4_3/core-identity/src: main/org/jboss/portal/core/identity/ui/admin and 1 other directories.

Author: thomas.heute(a)jboss.com Date: 2009-07-23 05:25:11 -0400 (Thu, 23 Jul 2009) New Revision: 13596 Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml Log: JBEPP-87: "Registered Users" won't be updated correctly after a user is created. JBEPP-88: The results of "search users" link won't be updated correctly after a user is created Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2009-07-23 08:35:09 UTC (rev 13595) +++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/CreateUserAction.java 2009-07-23 09:25:11 UTC (rev 13596) @@ -29,6 +29,7 @@ import org.jboss.portal.core.identity.services.metadata.CoreIdentityConfigurationException; import org.jboss.portal.core.identity.services.workflow.RegistrationService; import org.jboss.portal.core.identity.ui.IdentityUIUser; +import org.jboss.portal.core.identity.ui.admin.UserAdministrationBean; import org.jboss.portal.core.identity.ui.common.IdentityUserBean; import org.jboss.portal.core.identity.ui.common.MetaDataServiceBean; import org.jboss.portal.identity.User; @@ -71,6 +72,9 @@ /** . */ private MetaDataServiceBean metaDataService; + + /** . */ + private UserAdministrationBean userAdministrationBean; /** . */ private static final Logger log = Logger.getLogger(CreateUserAction.class); @@ -130,7 +134,17 @@ { this.metaDataService = metaDataService; } + + public UserAdministrationBean getUserAdministrationBean() + { + return userAdministrationBean; + } + public void setUserAdministrationBean(UserAdministrationBean userAdministrationBean) + { + this.userAdministrationBean = userAdministrationBean; + } + public String cancelRegistration() { this.uiUser = new IdentityUIUser(); @@ -183,6 +197,10 @@ registrationStatus = this.registrationService.registerUser(wURL, wUsername, wPassword, wProfileMap, wRoles, wLocale, false); } + + // Need to update the usercount and the search result + userAdministrationBean.markUserCountDirty(); + userAdministrationBean.markUserListDirty(); } catch (CoreIdentityConfigurationException e) Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2009-07-23 08:35:09 UTC (rev 13595) +++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2009-07-23 09:25:11 UTC (rev 13596) @@ -58,6 +58,9 @@ /** A list of users. */ private ListDataModel userList; + /** Mark the user list dirty when there is a change */ + private boolean userListDirty = false; + /** The page. */ private int page = 1; @@ -67,6 +70,9 @@ /** The user count. */ private int userCount = 0; + /** Mark the user count dirty when there is a change */ + private boolean userCountDirty = false; + /** The roles */ private List<String> roles = new ArrayList<String>(); @@ -116,7 +122,7 @@ public DataModel getUserList() { - if ( this.userList == null) + if ( this.userList == null || this.userListDirty) { this.searchUsers(); } @@ -319,7 +325,7 @@ public int getUserCount() { - if (userCount == 0) + if (userCount == 0 || userCountDirty) { try { @@ -335,6 +341,16 @@ return userCount; } + public void markUserCountDirty() + { + userCountDirty = true; + } + + public void markUserListDirty() + { + userListDirty = true; + } + public List<UserContainer> getPendingUsers() { try @@ -491,4 +507,5 @@ this.pendingUsers = null; return "success"; } + } Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2009-07-23 08:35:09 UTC (rev 13595) +++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2009-07-23 09:25:11 UTC (rev 13596) @@ -129,6 +129,10 @@ <property-name>registrationService</property-name> <value>#{applicationScope.RegistrationService}</value> </managed-property> + <managed-property> + <property-name>userAdministrationBean</property-name> + <value>#{useradministrationbean}</value> + </managed-property> </managed-bean> <managed-bean> <managed-bean-name>assignrolemgr</managed-bean-name>