[portal-commits] JBoss Portal SVN: r8389 - in branches/JBoss_Portal_Branch_2_6/core-identity/src: resources/portal-identity-war/WEB-INF and 1 other directory.
Author: emuckenhuber
Date: 2007-09-20 13:24:59 -0400 (Thu, 20 Sep 2007)
New Revision: 8389
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
Log:
- delete role and navigation update
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-20
17:21:50 UTC (rev 8388)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-09-20
17:24:59 UTC (rev 8389)
@@ -227,13 +227,13 @@
return "roleAdmin";
}
- public String confirmDelete()
+ public String confirmedDelete()
{
Role uRole;
try
{
uRole = identityRoleBean.getRoleModule().findRoleByName(this.uiRole.getName());
- this.identityRoleBean.getRoleModule().removeRole(uRole);
+ this.identityRoleBean.getRoleModule().removeRole(uRole.getId());
this.roleList = null;
}
catch (Exception e)
Modified:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20
17:21:50 UTC (rev 8388)
+++
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/faces-config.xml 2007-09-20
17:24:59 UTC (rev 8389)
@@ -416,7 +416,7 @@
<from-view-id>/WEB-INF/jsf/admin/user/registerConfirm.xhtml</from-view-id>
<navigation-case>
<from-outcome>revise</from-outcome>
- <to-view-id>/WEB-INF/jsf/admin/register.xhtml</to-view-id>
+ <to-view-id>/WEB-INF/jsf/admin/user/createUser.xhtml</to-view-id>
</navigation-case>
<navigation-case>
<from-outcome>registered</from-outcome>