[xwiki-notifications] r5577 - in xwiki-products/curriki/trunk: gwt/src/main/java/org/curriki/gwt/server web/src/main/webapp/skins/curriki8

[SVN]

Author: dward
Date: 2007-10-30 19:51:49 +0100 (Tue, 30 Oct 2007)
New Revision: 5577

Modified:
   
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
   xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
Log:
- CURRIKI-1063
 - Use first_name instead of login name for name of default collection
 - Default asset title and description to "first_name's Default 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-10-30 18:04:49 UTC (rev 5576)
+++ 
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/server/CurrikiServiceImpl.java
       2007-10-30 18:51:49 UTC (rev 5577)
@@ -65,7 +65,6 @@
 import java.util.Map;
 import java.util.Vector;
 
-
 public class CurrikiServiceImpl extends XWikiServiceImpl implements 
CurrikiService {
     private static final Log log = LogFactory.getLog(CurrikiServiceImpl.class);
 
@@ -203,8 +202,9 @@
         obj.set(Constants.ASSET_TITLE_PROPERTY, pageTitle, context);
         if (doc.getName().equals(Constants.DEFAULT_COLLECTION_PAGE)){
             String username = context.getUser();
-            username = username.substring(username.indexOf(".")+1);
-            pageTitle = username + "'s " + 
context.getMessageTool().get("default_collection");
+            XWikiDocument userdoc = context.getWiki().getDocument(username, 
context);
+            BaseObject userobj = userdoc.getObject("XWiki.XWikiUsers");
+            pageTitle = userobj.getStringValue("first_name") + "'s " + 
context.getMessageTool().get("default_collection");
             obj.setStringValue(Constants.ASSET_TITLE_PROPERTY, pageTitle);
             obj.setLargeStringValue(Constants.ASSET_DESCRIPTION_PROPERTY, 
pageTitle);
 

Modified: 
xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm
===================================================================
--- xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-30 18:04:49 UTC (rev 5576)
+++ xwiki-products/curriki/trunk/web/src/main/webapp/skins/curriki8/macros.vm   
2007-10-30 18:51:49 UTC (rev 5577)
@@ -123,9 +123,10 @@
  #set($currikiTitle = $!currikiDoc.displayTitle)
  #if($currikiDoc.space.startsWith("Coll_"))
   #findUserPrefix($currikiDoc.space.substring(5))
-  #if($currikiDoc.name == "Default")
-   #set($currikiTitle = "${userPrefix} Default Collection")        
-  #elseif($currikiDoc.name == "WebHome")
+##  #if($currikiDoc.name == "Default")
+##   #set($currikiTitle = "${userPrefix} Default Collection")        
+##  #elseif($currikiDoc.name == "WebHome")
+  #if($currikiDoc.name == "WebHome")
    #set($currikiTitle = "${userPrefix} Collections")
   #end
  #elseif($currikiDoc.space.startsWith("Blog_"))

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