[xwiki-notifications] r6447 - xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server

[SVN]

Author: ludovic
Date: 2007-12-20 23:56:46 +0100 (Thu, 20 Dec 2007)
New Revision: 6447

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
Log:
CURRIKI-1247 WebHome has overwritten my collection

Modified: 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
===================================================================
--- 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
       2007-12-20 17:27:10 UTC (rev 6446)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
       2007-12-20 22:56:46 UTC (rev 6447)
@@ -491,7 +491,7 @@
             BaseObject directionObj = 
compositeAssetDoc.newObject(Constants.DIRECTION_CLASS, context);
 
             addSubAsset(compositeAssetDoc, Constants.DIRECTION + 
directionObj.getNumber(), position, context);
-
+            compositeAssetDoc.setAuthor(context.getUser());
             context.getWiki().saveDocument(compositeAssetDoc, 
context.getMessageTool().get("curriki.comment.adddirectionblock"), context);
 
         } catch (Exception e) {
@@ -896,8 +896,10 @@
         if (assertDuplicateRight(templateAssetDoc, context)==false)
           return null;
 
-        if (pageName == null){
+        if ((pageName == null)||(pageName.equals(""))) {
             pageName = context.getWiki().getUniquePageName(space, context);
+        } else {
+            pageName = context.getWiki().getUniquePageName(space, pageName, 
context);
         }
 
         XWikiDocument assetDoc = context.getWiki().getDocument(space, 
pageName, context);

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications