Author: tmortagne
Date: 2008-01-19 19:43:53 +0100 (Sat, 19 Jan 2008)
New Revision: 6968

Modified:
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
   
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
Log:
XAWM-45: Improve informations panels using GlobalSearch
XAWM-46: Informations panels use wikis aliases as wikis

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
     2008-01-19 18:05:14 UTC (rev 6967)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastCreatedWikisWidget
     2008-01-19 18:43:53 UTC (rev 6968)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191861931000</creationDate>
-<date>1192548685000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200762043000</date>
+<contentUpdateDate>1200762043000</contentUpdateDate>
+<version>4.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -97,37 +97,38 @@
 <category>Information</category>
 </property>
 <property>
-<content>#panelheader($msg.get("wikimanager.widget.lastcreatedwikis.title"))
-
-  #includeMacros("WikiCode.Macros")
-
-  #set($WikiManager = $xwiki.wikimanager)
-  #set($Exception = $WikiManager.DefaultException)
-
-#############################################################################
-
-  #if(!$nb)
-    #set($nb = 5)
-  #end
-
-  #if(!$allwikilist)
-    #set($allwikilist = $WikiManager.getWikiDocumentList())
-  #end
-
-  #if(!$creationsortedallwikilist)
-    #sortDocumentByCreationDate($allwikilist $creationsortedallwikilist false)
-  #end
-
-#############################################################################
-
-  #if(!$creationsortedallwikilist.isEmpty())
-    #foreach($wikidoc in $creationsortedallwikilist)
-      #if($velocityCount &lt; $nb)
-        #displaymodification($wikidoc.wikiName $wikidoc.getHomePageUrl() 
$wikidoc.creationDate $formatDate $wikidoc.creator true)
-      #end
-    #end
-  #end
-
+<content>#panelheader($msg.get("wikimanager.widget.lastcreatedwikis.title"))
+  ##
+  #includeMacros("WikiCode.Macros")
+  ##
+  #set($WikiManager = $xwiki.wikimanager)
+  #set($Exception = $WikiManager.DefaultException)
+  ##
+#############################################################################
+  ##
+  #if(!$nb)
+    #set($nb = 5)
+  #end
+  ##
+  #if(!$allwikilist)
+    #set($allwikilist = $WikiManager.getAllWikis())
+  #end
+  ##
+  #if(!$creationsortedallwikilist)
+    #sortDocumentByCreationDate($allwikilist $creationsortedallwikilist false)
+  #end
+  ##
+#############################################################################
+  ##
+  #if(!$creationsortedallwikilist.isEmpty())
+    #foreach($wikidoc in $creationsortedallwikilist)
+      #set($firstwikialias = $wikidoc.wikiAliasList.iterator().next())
+      #if($velocityCount &lt; $nb)
+        #displaymodification($wikidoc.wikiName 
$firstwikialias.getHomePageUrl() $wikidoc.creationDate $formatDate 
$wikidoc.creator true)
+      #end
+    #end
+  #end
+  ##
 #panelfooter()</content>
 </property>
 <property>

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
  2008-01-19 18:05:14 UTC (rev 6967)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsCode
  2008-01-19 18:43:53 UTC (rev 6968)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191514175000</creationDate>
-<date>1196265534000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200765508000</date>
+<contentUpdateDate>1200765508000</contentUpdateDate>
+<version>44.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -54,34 +54,63 @@
 <tags/>
 </property>
 </object>
-<content>#includeMacros("WikiCode.Macros")
-
-#############################################################################
-
-#if(!$nb)
-  #set($nb = 30)
-#end
-
-#if(!$wikinamelist)
-  #if(!$wikiname)
-    #set($wikinamelist = [$context.Database])
-  #else
-    #set($wikinamelist = [$wikiname])
-  #end
-#end
-
-#set($documentlist = [])
-#foreach($wikiname in $wikinamelist)
-  #addlastwikimodifications($documentlist $wikiname $usermodifications 
$usermodificationswiki $nb)
-#end
-
-#if($documentlist.size() &gt; $nb)
-  #set($documentlist = $documentlist.subList(0, $nb))
-#end
-
-#############################################################################
-
-#foreach ($item in $documentlist)
-  #displaymodification($item.name $item.prefixedFullName $item.date 
$formatDate $item.author true)
+<content>#set($WikiManager = $xwiki.wikimanager)
+#set($Globalsearch = $WikiManager.searchApi)
+##
+#includeMacros("WikiCode.Macros")
+##
+#############################################################################
+##
+#if(!$nb)
+  #set($nb = 30)
+#end
+##
+#if(!$wikinamelist)
+  #if($wikilist)
+    #set($wikinamelist = [])
+    #foreach($wikidoc in $wikilist)
+      #set($added = $wikinamelist.add($wikidoc.wikiName))
+    #end
+  #else
+    #if(!$allwikilist)
+      #set($allwikilist = $WikiManager.getAllWikis())
+    #end
+    ##
+    #if(!$allwikinamelist)
+      #set($allwikinamelist = [])
+      #foreach($wikidoc in $allwikilist)
+        #set($added = $allwikinamelist.add($wikidoc.wikiName))
+      #end
+      ##
+      #if(!$allwikinamelist.contains($context.mainWikiName))
+        #set($added = $allwikinamelist.add($context.mainWikiName))
+      #end
+    #end
+    ##
+    #set($wikinamelist = $allwikinamelist)
+  #end
+#end
+##
+#set($sql = "where 1=1")
+#if($usermodifications)
+  #if($context.database != $usermodificationswiki)
+    #set($sql = "${sql} and 
doc.author='${usermodificationswiki}:${usermodifications}'")
+  #else
+    #set($sql = "${sql} and doc.author='${usermodifications}'")
+  #end
+#end
+#set($sql = "${sql} order by doc.date desc")
+##
+#set($query = $Globalsearch.newQuery())
+$query.setHql("where 1=1 and doc.author='XWiki.Admin' order by doc.date desc")
+$query.setWikiNameList($wikinamelist)
+$query.setMax($nb)
+##
+#set($documentlist = $Globalsearch.searchDocuments($query, false))
+##
+#############################################################################
+##
+#foreach ($item in $documentlist)
+  #displaymodification("$item.wiki - $item.displayTitle in $item.space" 
$item.prefixedFullName $item.date $formatDate $item.author true)
 #end</content>
 </xwikidoc>

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
        2008-01-19 18:05:14 UTC (rev 6967)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/LastWikiModificationsWidget
        2008-01-19 18:43:53 UTC (rev 6968)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191858101000</creationDate>
-<date>1195041935000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200763469000</date>
+<contentUpdateDate>1200763469000</contentUpdateDate>
+<version>8.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -97,33 +97,17 @@
 <category>Information</category>
 </property>
 <property>
-<content>#panelheader($msg.get("wikimanager.widget.lastmodifications.title"))
-
-  #includeMacros("WikiCode.Macros")
-
-  #set($WikiManager = $xwiki.wikimanager)
-  #set($Exception = $WikiManager.DefaultException)
-
-#############################################################################
-
-  #if(!$allwikilist)
-    #set($allwikilist = $WikiManager.getWikiDocumentList())
-  #end
-
-  #if(!$allwikinamelist)
-    #set($allwikinamelist = [$context.mainWiki])
-
-    #foreach($wikidoc in $wikilist)
-      #set($added = $allwikinamelist.add($wikidoc.wikiName))
-    #end
-  #end
-
-  #set($wikinamelist = $allwikinamelist)
-
-#############################################################################
-
-  #includeInContext("WikiCode.LastWikiModificationsCode")
-
+<content>#panelheader($msg.get("wikimanager.widget.lastmodifications.title"))
+  ##
+  #includeMacros("WikiCode.Macros")
+  ##
+  #set($WikiManager = $xwiki.wikimanager)
+  #set($Exception = $WikiManager.DefaultException)
+  ##
+#############################################################################
+  ##
+  #includeInContext("WikiCode.LastWikiModificationsCode")
+  ##
 #panelfooter()</content>
 </property>
 <property>

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
     2008-01-19 18:05:14 UTC (rev 6967)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/Macros
     2008-01-19 18:43:53 UTC (rev 6968)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191500546000</creationDate>
-<date>1196265585000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200760330000</date>
+<contentUpdateDate>1200760330000</contentUpdateDate>
+<version>18.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -54,82 +54,38 @@
 <tags/>
 </property>
 </object>
-<content>#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist 
$asc)
-  #set($sorteddocumentlist = [])
-
-  #if($documentlist.size() &gt;0)
-    #set($doc0 = $documentlist.get(0))
-
-    #foreach($doc1 in $documentlist)
-
-      #foreach($doc2 in $documentlist)
-        #if (!$sorteddocumentlist.contains($doc2))
-          #if($sorteddocumentlist.contains($doc0) || ($asc &amp;&amp; 
($doc0.creationDate.compareTo($doc2.creationDate)) &gt; 0) || (!$asc &amp;&amp; 
($doc0.creationDate.compareTo($doc2.creationDate) &lt; 0)))
-            #set($doc0 = $doc2)
-          #end
-        #end
-      #end
-
-      #set($added = $sorteddocumentlist.add($doc0))
-    #end
-  #end
-#end
-
-#macro(displaymodification $pagename $pagelink $date $formatDate $user $star)
-  #if(!$formatDate)
-    #set($formatDate = $msg.get("wikimanager.defaultdatetimeformat"))
-  #end
-  #if($formatDate == "wikimanager.defaultdatetimeformat")
-    #set($formatDate = "yyyy MMMM dd 'at' HH:mm")
-  #end
-
-  #set($username = $xwiki.getUserName($user))
-  #if ($username == "XWikiGuest")
-    #set($username = "Guest")
-  #end
-
-  #if($star)*#end [$pagename&gt;$pagelink] $xwiki.formatDate($date, 
$formatDate) $username
-#end
-
-#macro(addlastwikimodifications $documentlist $wikiname $usermodifications 
$usermodificationswiki $nb)
-  #set($currentwiki = $context.database)
-  #if($wikiname)
-    $context.setDatabase($wikiname)
-  #else
-    #set($wikiname = $context.Database)
-  #end
-
-  #set($sql = "where 1=1")
-  #if($usermodifications)
-    #if($context.database != $usermodificationswiki)
-      #set($sql = "${sql} and 
doc.author='${usermodificationswiki}:${usermodifications}'")
-    #else
-      #set($sql = "${sql} and doc.author='${usermodifications}'")
-    #end
-  #end
-  #set($sql = "${sql} order by doc.date desc")
-
-  #set($list = $xwiki.searchDocuments($sql , $nb , 0))
-
-  #foreach($docname in $list)
-    #if ($xwiki.hasAccessLevel("view", $context.user, 
"${context.database}:${docname}"))
-      #set($item = $xwiki.getDocument($docname))
-      #set($insertAt = $xwiki.null)
-      #foreach($sorteddoc in $documentlist)
-        #if(!$insertAt &amp;&amp; $sorteddoc.date.before($item.date))
-          #set($inserAt = $velocityCount-1)
-        #end
-      #end
-      #if($inserAt)
-        #set($added = $documentlist.add($inserAt, $item))
-      #else
-        #set($added = $documentlist.add($item))
-      #end
-    #end
-  #end
-
-  #if($context.database != $currentwiki)
-    $context.setDatabase($currentwiki)
-  #end
+<content>#macro(sortDocumentByCreationDate $documentlist $sorteddocumentlist 
$asc)
+  #set($sorteddocumentlist = [])
+  ##
+  #foreach($docEntry in $documentlist)
+    ##
+    #set($index = -1)
+    #foreach($sortedDoc in $sorteddocumentlist)
+      #if($index == -1 &amp;&amp; (($asc &amp;&amp; 
($sortedDoc.creationDate.after($docEntry.creationDate))) || (!$asc &amp;&amp; 
($sortedDoc.creationDate.before($docEntry.creationDate)))))
+        #set($index = $velocityCount - 1)
+      #end
+    #end
+    #if($index == -1)
+      #set($added = $sorteddocumentlist.add($docEntry))
+    #else
+     #set($added = $sorteddocumentlist.add($index, $docEntry))
+    #end
+  #end
+#end
+
+#macro(displaymodification $pagename $pagelink $date $formatDate $user $star)
+  #if(!$formatDate)
+    #set($formatDate = $msg.get("wikimanager.defaultdatetimeformat"))
+  #end
+  #if($formatDate == "wikimanager.defaultdatetimeformat")
+    #set($formatDate = "yyyy MMMM dd 'at' HH:mm")
+  #end
+
+  #set($username = $xwiki.getUserName($user))
+  #if ($username == "XWikiGuest")
+    #set($username = "Guest")
+  #end
+
+  #if($star)*#end [$pagename&gt;$pagelink] $xwiki.formatDate($date, 
$formatDate) $username
 #end</content>
 </xwikidoc>

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
      2008-01-19 18:05:14 UTC (rev 6967)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/MyLastWikiModificationsWidget
      2008-01-19 18:43:53 UTC (rev 6968)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191862105000</creationDate>
-<date>1192967360000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200763366000</date>
+<contentUpdateDate>1200763366000</contentUpdateDate>
+<version>3.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -97,34 +97,19 @@
 <category>Information</category>
 </property>
 <property>
-<content>#panelheader($msg.get("wikimanager.widget.mylastmodifications.title"))
-
-  #includeMacros("WikiCode.Macros")
-
-  #set($WikiManager = $xwiki.wikimanager)
-  #set($Exception = $WikiManager.DefaultException)
-
-#############################################################################
-
-  #if(!$allwikilist)
-    #set($allwikilist = $WikiManager.getWikiDocumentList())
-  #end
-
-  #if(!$allwikinamelist)
-    #set($allwikinamelist = [$context.mainWiki])
-    #foreach($wikidoc in $wikilist)
-      #set($added = $allwikinamelist.add($wikidoc.wikiName))
-    #end
-  #end
-
-  #set($wikinamelist = $allwikinamelist)
-
-#############################################################################
-
-  #set($usermodifications = "${context.user}")
-  #set($usermodificationswiki = "${context.database}")
-  #includeInContext("WikiCode.LastWikiModificationsCode")
-
+<content>#panelheader($msg.get("wikimanager.widget.mylastmodifications.title"))
+  ##
+  #includeMacros("WikiCode.Macros")
+  ##
+  #set($WikiManager = $xwiki.wikimanager)
+  #set($Exception = $WikiManager.DefaultException)
+  ##
+#############################################################################
+  ##
+  #set($usermodifications = "${context.user}")
+  #set($usermodificationswiki = "${context.database}")
+  #includeInContext("WikiCode.LastWikiModificationsCode")
+  ##
 #panelfooter()</content>
 </property>
 <property>

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
     2008-01-19 18:05:14 UTC (rev 6967)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsAdminWidget
     2008-01-19 18:43:53 UTC (rev 6968)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191861990000</creationDate>
-<date>1192549257000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200762080000</date>
+<contentUpdateDate>1200762080000</contentUpdateDate>
+<version>6.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -97,33 +97,34 @@
 <category>Information</category>
 </property>
 <property>
-<content>#panelheader($msg.get("wikimanager.widget.userwikisadmin.title"))
-
-  #includeMacros("WikiCode.Macros")
-
-  #set($WikiManager = $xwiki.wikimanager)
-  #set($Exception = $WikiManager.DefaultException)
-
-#############################################################################
-
-  #if(!$allwikilist)
-    #set($allwikilist = $WikiManager.getWikiDocumentList())
-  #end
-
-#############################################################################
-
-  #if(!$allwikilist.isEmpty())
-    #set($currentwiki = $context.database)
-    #foreach($wikidoc in $allwikilist)
-      $context.setDatabase($wikidoc.wikiName)
-      #if($xwiki.hasAccessLevel("admin", 
"${currentwiki}:${context.localUser}", "XWiki.XWikiPreferences"))
-        $context.setDatabase($currentwiki)
-        #displaymodification($wikidoc.wikiName $wikidoc.homePageUrl 
$wikidoc.creationDate $formatDate $wikidoc.creator true)
-      #end
-    #end
-    $context.setDatabase($currentwiki)
-  #end
-
+<content>#panelheader($msg.get("wikimanager.widget.userwikisadmin.title"))
+  ##
+  #includeMacros("WikiCode.Macros")
+  ##
+  #set($WikiManager = $xwiki.wikimanager)
+  #set($Exception = $WikiManager.DefaultException)
+  ##
+#############################################################################
+  ##
+  #if(!$allwikilist)
+    #set($allwikilist = $WikiManager.getAllWikis())
+  #end
+  ##
+#############################################################################
+  ##
+  #if(!$allwikilist.isEmpty())
+    #set($currentwiki = $context.database)
+    #foreach($wikidoc in $allwikilist)
+      #set($firstwikialias = $wikidoc.wikiAliasList.iterator().next())
+      $context.setDatabase($wikidoc.wikiName)
+      #if($xwiki.hasAccessLevel("admin", 
"${currentwiki}:${context.localUser}", "XWiki.XWikiPreferences"))
+        $context.setDatabase($currentwiki)
+        #displaymodification($wikidoc.wikiName $firstwikialias.homePageUrl 
$wikidoc.creationDate $formatDate $wikidoc.creator true)
+      #end
+    #end
+    $context.setDatabase($currentwiki)
+  #end
+  ##
 #panelfooter()</content>
 </property>
 <property>

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
     2008-01-19 18:05:14 UTC (rev 6967)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsOwnerWidget
     2008-01-19 18:43:53 UTC (rev 6968)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191862009000</creationDate>
-<date>1192549207000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200762062000</date>
+<contentUpdateDate>1200762062000</contentUpdateDate>
+<version>4.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -97,28 +97,29 @@
 <category>Information</category>
 </property>
 <property>
-<content>#panelheader($msg.get("wikimanager.widget.userwikisowner.title"))
-
-  #includeMacros("WikiCode.Macros")
-
-  #set($WikiManager = $xwiki.wikimanager)
-  #set($Exception = $WikiManager.DefaultException)
-
-#############################################################################
-
-  #if(!$allwikilist)
-    #set($allwikilist = $WikiManager.getWikiDocumentList())
-  #end
-
-#############################################################################
-
-  #if(!$allwikilist.isEmpty())
-    #foreach($wikidoc in $allwikilist)
-      #if($wikidoc.owner == $context.user)
-        #displaymodification($wikidoc.wikiName $wikidoc.homePageUrl 
$wikidoc.creationDate $formatDate $wikidoc.creator true)
-      #end
-    #end
-  #end
+<content>#panelheader($msg.get("wikimanager.widget.userwikisowner.title"))
+  ##
+  #includeMacros("WikiCode.Macros")
+  ##
+  #set($WikiManager = $xwiki.wikimanager)
+  #set($Exception = $WikiManager.DefaultException)
+  ##
+#############################################################################
+  ##
+  #if(!$allwikilist)
+    #set($allwikilist = $WikiManager.getAllWikis())
+  #end
+  ##
+#############################################################################
+  ##
+  #if(!$allwikilist.isEmpty())
+    #foreach($wikidoc in $allwikilist)
+      #set($firstwikialias = $wikidoc.wikiAliasList.iterator().next())
+      #if($firstwikialias.owner == $context.user)
+        #displaymodification($wikidoc.wikiName $firstwikialias.homePageUrl 
$wikidoc.creationDate $formatDate $wikidoc.creator true)
+      #end
+    #end
+  #end
 #panelfooter()</content>
 </property>
 <property>

Modified: 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
===================================================================
--- 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
      2008-01-19 18:05:14 UTC (rev 6967)
+++ 
xwiki-platform/xwiki-applications/trunk/wiki-manager/src/main/resources/WikiCode/UserWikisIsUserWidget
      2008-01-19 18:43:53 UTC (rev 6968)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1191861970000</creationDate>
-<date>1192548761000</date>
-<contentUpdateDate>1199724180000</contentUpdateDate>
-<version>1.1</version>
+<date>1200762099000</date>
+<contentUpdateDate>1200762099000</contentUpdateDate>
+<version>6.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -97,33 +97,34 @@
 <category>Information</category>
 </property>
 <property>
-<content>#panelheader($msg.get("wikimanager.widget.userwikisuser.title")) 
-
-  #includeMacros("WikiCode.Macros")
-
-  #set($WikiManager = $xwiki.wikimanager)
-  #set($Exception = $WikiManager.DefaultException)
-
-#############################################################################
-
-  #if(!$allwikilist)
-    #set($allwikilist = $WikiManager.getWikiDocumentList())
-  #end
-
-#############################################################################
-
-  #if(!$allwikilist.isEmpty())
-      #set($currentwiki = $context.database)
-      #foreach($wikidoc in $allwikilist)
-        $context.setDatabase($wikidoc.wikiName)
-        #if($xwiki.hasAccessLevel("view", 
"${currentwiki}:${context.localUser}", "XWiki.XWikiPreferences"))
-          $context.setDatabase($currentwiki)
-          #displaymodification($wikidoc.wikiName $wikidoc.getHomePageUrl() 
$wikidoc.creationDate $formatDate $wikidoc.creator true)
-        #end
-      #end
-      $context.setDatabase($currentwiki)
-  #end
-
+<content>#panelheader($msg.get("wikimanager.widget.userwikisuser.title")) 
+  ##
+  #includeMacros("WikiCode.Macros")
+  ##
+  #set($WikiManager = $xwiki.wikimanager)
+  #set($Exception = $WikiManager.DefaultException)
+  ##
+#############################################################################
+  ##
+  #if(!$allwikilist)
+    #set($allwikilist = $WikiManager.getAllWikis())
+  #end
+  ##
+#############################################################################
+  ##
+  #if(!$allwikilist.isEmpty())
+      #set($currentwiki = $context.database)
+      #foreach($wikidoc in $allwikilist)
+        #set($firstwikialias = $wikidoc.wikiAliasList.iterator().next())
+        $context.setDatabase($wikidoc.wikiName)
+        #if($xwiki.hasAccessLevel("view", 
"${currentwiki}:${context.localUser}", "XWiki.XWikiPreferences"))
+          $context.setDatabase($currentwiki)
+          #displaymodification($wikidoc.wikiName $firstwikialias.homePageUrl 
$wikidoc.creationDate $formatDate $wikidoc.creator true)
+        #end
+      #end
+      $context.setDatabase($currentwiki)
+  #end
+  ##
 #panelfooter()</content>
 </property>
 <property>

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to