Author: emuckenhuber Date: 2007-09-11 08:36:29 -0400 (Tue, 11 Sep 2007) New Revision: 8225 Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml Log: - fixed edit role members Modified: trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java =================================================================== --- trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 12:15:05 UTC (rev 8224) +++ trunk/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 12:36:29 UTC (rev 8225) @@ -29,7 +29,6 @@ import javax.faces.application.FacesMessage; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import javax.portlet.PortletMode; import javax.portlet.WindowState; import javax.portlet.WindowStateException; @@ -45,7 +44,6 @@ import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portlet.JBossActionRequest; import org.jboss.portlet.JBossActionResponse; -import org.jboss.portlet.JBossRenderResponse; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> Modified: trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 12:15:05 UTC (rev 8224) +++ trunk/core-identity/src/resources/portal-identity-sar/conf/identity-ui-configuration.xml 2007-09-11 12:36:29 UTC (rev 8225) @@ -24,8 +24,8 @@ <identity-ui-configuration> - <subscription-mode>jbp_identity_validation_approval_workflow</subscription-mode> - <overwrite-workflow>true</overwrite-workflow> + <subscription-mode>automatic</subscription-mode> + <overwrite-workflow>false</overwrite-workflow> <email-domain>jboss.org</email-domain> <email-from&gt;do-no-reply(a)jboss.com&lt;/email-from&gt; <password-generation-characters>0123456789aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWyYzZ*#!+-/"</password-generation-characters> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-11 12:15:05 UTC (rev 8224) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-11 12:36:29 UTC (rev 8225) @@ -430,7 +430,18 @@ <from-action>#{lostpasswordmgr.doomed}</from-action> <from-outcome>lostPassword</from-outcome> <to-view-id>/WEB-INF/jsf/admin/editProfile.xhtml</to-view-id> - </navigation-case> - </navigation-rule> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/WEB-INF/jsf/admin/user/changePassword.xhtml</from-view-id> + <navigation-case> + <from-outcome>status</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>searchUsers</from-outcome> + <to-view-id>/WEB-INF/jsf/admin/user/searchUsers.xhtml</to-view-id> + </navigation-case> + </navigation-rule> </faces-config> Modified: trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml =================================================================== --- trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-11 12:15:05 UTC (rev 8224) +++ trunk/core-identity/src/resources/portal-identity-war/WEB-INF/jsf/admin/roles/roleMembers.xhtml 2007-09-11 12:36:29 UTC (rev 8225) @@ -44,7 +44,7 @@ <f:facet name="header"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION}"/> </f:facet> - <h:commandLink action="#{editprofilemgr.editProfile}"> + <h:commandLink action="#{editprofilemgr.adminEditProfile}"> <h:outputText value="#{bundle.IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE}"/> <f:param name="currentUser" value="#{uiUser.username}"/> </h:commandLink> |