Author: cvrabie
Date: 2008-01-17 00:09:59 +0100 (Thu, 17 Jan 2008)
New Revision: 6877
Modified:
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
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/SpaceApi.java
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
Log:
Made the space validation method visible from the velocity context
Modified:
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
2008-01-16 22:56:29 UTC (rev 6876)
+++
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/SpaceManager.java
2008-01-16 23:09:59 UTC (rev 6877)
@@ -196,7 +196,7 @@
* @param space
* @param context
*/
- public void updateSpaceFromRequest(Space space, XWikiContext context)
throws SpaceManagerException;
+ public boolean updateSpaceFromRequest(Space space, XWikiContext context)
throws SpaceManagerException;
/**
* Validate that the space data is valid. Wrong data are stored in the
context
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-16 22:56:29 UTC (rev 6876)
+++
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
2008-01-16 23:09:59 UTC (rev 6877)
@@ -842,8 +842,12 @@
return spaceList;
}
- public void updateSpaceFromRequest(Space space, XWikiContext context)
throws SpaceManagerException {
- space.updateSpaceFromRequest();
+ public boolean updateSpaceFromRequest(Space space, XWikiContext context)
throws SpaceManagerException {
+ space.updateSpaceFromRequest();
+ if(space.validateSpaceData())
+ return true;
+ else
+ return false;
}
public boolean validateSpaceData(Space space, XWikiContext context) throws
SpaceManagerException {
Modified:
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceApi.java
===================================================================
---
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceApi.java
2008-01-16 22:56:29 UTC (rev 6876)
+++
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceApi.java
2008-01-16 23:09:59 UTC (rev 6877)
@@ -171,4 +171,11 @@
throw new SpaceManagerException(e);
}
}
+
+ /**
+ * Validates the space data
+ */
+ public boolean validateSpaceData(){
+ return validateSpaceData();
+ }
}
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-16 22:56:29 UTC (rev 6876)
+++
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/plugin/SpaceManagerPluginApi.java
2008-01-16 23:09:59 UTC (rev 6877)
@@ -293,8 +293,7 @@
if (!hasProgrammingRights())
return false;
- getSpaceManager().updateSpaceFromRequest(space, context);
- return true;
+ return getSpaceManager().updateSpaceFromRequest(space, context);
}
/**
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
