Author: dward
Date: 2008-02-08 19:27:46 +0100 (Fri, 08 Feb 2008)
New Revision: 7411
Modified:
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManagerExtension.java
Log:
- CURRIKI-1566
- getRoleGroupName() now returns right group if passed the admin or member
group
Modified:
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManagerExtension.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManagerExtension.java
2008-02-08 17:53:57 UTC (rev 7410)
+++
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpaceManagerExtension.java
2008-02-08 18:27:46 UTC (rev 7411)
@@ -105,9 +105,16 @@
* @param role The page name of the role we want to use
* @return The full page name of the role
*
- * TODO: This should probably check to see if the role is valid
*/
public String getRoleGroupName(String spaceName, String role) {
+ if (getAdminGroupName(spaceName).equals(role) ||
getMemberGroupName(spaceName).equals(role)){
+ return role;
+ } else if (getAdminGroupName(spaceName).equals(spaceName+"."+role)){
+ return getAdminGroupName(spaceName);
+ } else if (getMemberGroupName(spaceName).equals(spaceName+"."+role)){
+ return getMemberGroupName(spaceName);
+ }
+
return (role.startsWith(spaceName+".")?role:spaceName+"."+role);
}
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
