Author: ludovic
Date: 2008-01-12 15:03:34 +0100 (Sat, 12 Jan 2008)
New Revision: 6796
Modified:
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
Log:
CURRIKI-1345 Rights in groups implementation
Modified:
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
2008-01-12 09:15:18 UTC (rev 6795)
+++
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
2008-01-12 14:03:34 UTC (rev 6796)
@@ -256,7 +256,7 @@
* @param allow True if the right is allow, deny if not
*/
protected boolean giveRightToGroup( String spaceName, String groupName,
String level, boolean allow, boolean global, XWikiContext context) throws
XWikiException {
- final String rightsClass = global ? "XWiki.XWikiRights" :
"XWiki.XWikiRights";
+ final String rightsClass = global ? "XWiki.XWikiGlobalRights" :
"XWiki.XWikiRights";
final String prefDocName = spaceName+".WebPreferences";
final String groupsField = "groups";
final String levelsField = "levels";
@@ -304,6 +304,7 @@
//we don't have to handle lots of situation when we change rights
if( !exists ){
BaseObject bobj = new BaseObject();
+ bobj.setClassName(rightsClass);
bobj.setStringValue(groupsField, groupName);
bobj.setStringValue(levelsField, level);
bobj.setIntValue(allowField, allowInt);
@@ -325,6 +326,7 @@
} else {
//if there are more groups/levels, extract this one(s)
bobj = new BaseObject();
+ bobj.setClassName(rightsClass);
bobj.setStringValue(levelsField, level);
bobj.setIntValue(allowField, allowInt);
bobj.setStringValue(groupsField, groupName);
Modified:
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
2008-01-12 09:15:18 UTC (rev 6795)
+++
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
2008-01-12 14:03:34 UTC (rev 6796)
@@ -200,13 +200,14 @@
/**
* Search for spaces using an HQL query returning Space objects
*
- * @param hql
+ * @param fromsql
+ * @param wheresql
* @param start
* @param nb
* @return list of space objects
*/
- public List searchSpaces(String hql, int nb, int start) throws
SpaceManagerException {
- List spacesList = getSpaceManager().searchSpaces(hql, "", nb, start,
context);
+ public List searchSpaces(String fromsql, String wheresql, int nb, int
start) throws SpaceManagerException {
+ List spacesList = getSpaceManager().searchSpaces(fromsql, wheresql,
nb, start, context);
return spacesList;
}
@@ -214,13 +215,14 @@
/**
* Search for spaces using an HQL query returning Space Names
*
- * @param hql
+ * @param fromsql
+ * @param wheresql
* @param start
* @param nb
* @return
*/
- public List searchSpaceNames(String hql, int nb, int start) throws
SpaceManagerException {
- return getSpaceManager().searchSpaceNames(hql, "", nb, start, context);
+ public List searchSpaceNames(String fromsql, String wheresql, int nb, int
start) throws SpaceManagerException {
+ return getSpaceManager().searchSpaceNames(fromsql, wheresql, nb,
start, context);
}
/**
* Get the list of spaces for a user in a specific role
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
