[xwiki-notifications] r6830 - in xwiki-products/curriki/trunk/plugins: currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl

[SVN]

Author: ludovic
Date: 2008-01-15 01:29:44 +0100 (Tue, 15 Jan 2008)
New Revision: 6830

Modified:
   
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpace.java
   
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/Space.java
   
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceImpl.java
   
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
Log:
CURRIKI-1435 Group Creation Date is Wrong

Modified: 
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpace.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpace.java
       2008-01-14 23:30:35 UTC (rev 6829)
+++ 
xwiki-products/curriki/trunk/plugins/currikispacemanager/src/main/java/org/curriki/plugin/spacemanager/impl/CurrikiSpace.java
       2008-01-15 00:29:44 UTC (rev 6830)
@@ -68,8 +68,8 @@
                errors.put( this.VALIDATION_SPACE_EXISTS, "1" );
             
             //same shortcut url
-            //NOT WORKING
-            //List list = 
context.getWiki().getStore().searchDocumentsNames("where doc.url='" + 
this.getHomeShortcutURL() + "'", context);
+            List list = 
context.getWiki().getStore().searchDocumentsNames(",BaseObject as obj, 
StringProperty as urlprop where doc.fullName=obj.name and obj.id=urlprop.id.id 
and urlprop.id.name='"
+                                    + SPACE_URLSHORTCUT + "' and 
urlprop.value='" + this.getHomeShortcutURL() + "'", context);
             //if(list!=null && list.size()>0)
                //errors.add( this.VALIDATION_URL_EXISTS, "1" );
             

Modified: 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/Space.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/Space.java
        2008-01-14 23:30:35 UTC (rev 6829)
+++ 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/api/Space.java
        2008-01-15 00:29:44 UTC (rev 6830)
@@ -4,6 +4,7 @@
 import com.xpn.xwiki.XWikiException;
 
 import java.util.List;
+import java.util.Date;
 
 /**
  * Created by IntelliJ IDEA.
@@ -175,4 +176,10 @@
      * @throws SpaceManagerException
      */
     public boolean validateSpaceData() throws SpaceManagerException;
+
+    /**
+     * Set the creation date of the space
+     * @param date
+     */
+    public void setCreationDate(Date date);
 }

Modified: 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceImpl.java
===================================================================
--- 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceImpl.java
   2008-01-14 23:30:35 UTC (rev 6829)
+++ 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceImpl.java
   2008-01-15 00:29:44 UTC (rev 6830)
@@ -29,6 +29,7 @@
 import org.xwiki.plugin.spacemanager.api.SpaceManagerException;
 
 import java.util.List;
+import java.util.Date;
 
 /**
  * Implementing class
@@ -266,4 +267,8 @@
             throw new SpaceManagerException(e);
         }
     }
+
+    public void setCreationDate(Date date) {
+        getDoc().setCreationDate(date);
+    }
 }

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-14 23:30:35 UTC (rev 6829)
+++ 
xwiki-products/curriki/trunk/plugins/spacemanager/src/main/java/org/xwiki/plugin/spacemanager/impl/SpaceManagerImpl.java
    2008-01-15 00:29:44 UTC (rev 6830)
@@ -517,6 +517,7 @@
         newspace.setType(getSpaceTypeName());
         newspace.setDisplayTitle(spaceTitle);
         newspace.setCreator(context.getUser());
+        newspace.setCreationDate(new Date());
         try {
             newspace.saveWithProgrammingRights();
             // we need to add the creator as a member and as an admin
@@ -576,6 +577,9 @@
         newspace.setType(getSpaceTypeName());
         // we need to do it twice because data could have been overwritten by 
copyWikiWeb
         newspace.updateSpaceFromRequest();
+        newspace.setCreator(context.getUser());
+        newspace.setCreationDate(new Date());
+        
         try {
             newspace.saveWithProgrammingRights();
             // we need to add the creator as a member and as an admin

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