XWiki

SVN Wed, 12 Dec 2007 05:46:15 -0800

Author: tmortagne
Date: 2007-12-12 14:46:02 +0100 (Wed, 12 Dec 2007)
New Revision: 6353


Modified:
   xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/Results
Log:
XE-161: XWiki.Result page has multiwiki problems

Modified: 
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/Results
===================================================================
--- xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/Results 
2007-12-12 13:45:11 UTC (rev 6352)
+++ xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/Results 
2007-12-12 13:46:02 UTC (rev 6353)
@@ -12,14 +12,15 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1158300067000</creationDate>
-<date>1195829499000</date>
-<contentUpdateDate>1195829499000</contentUpdateDate>
-<version>1.4</version>
+<date>1197466653000</date>
+<contentUpdateDate>1197466653000</contentUpdateDate>
+<version>8.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
 <comment></comment>
+<minorEdit>false</minorEdit>
 <object>
 <class>
 <name>XWiki.TagClass</name>
@@ -53,120 +54,126 @@
 <tags/>
 </property>
 </object>
-<content>#set($showdata = 0)
-#set($formatDate = "yyyy MMMM dd, HH:mm")
-
-## WARNING: Do not add any empty line inside the table element. This will 
potentially break
-## the Javascript we're using for filtering/sorting columns. It might work in 
FF but will break
-## in other browsers like IE. This is because empty lines add &lt;p 
class="paragraph"&gt;&lt;/p&gt; elements
-## when rendered.
-
-&lt;table id="searchTableUnique" class="grid sortable filterable doOddEven"&gt;
-  &lt;tr class="sortHeader"&gt;
-    &lt;th&gt;Page&lt;/th&gt;
-    &lt;th style="width:150px" class="selectFilter"&gt;Space&lt;/th&gt;
-    #if($xwiki.isVirtual())
-      &lt;th style="width:150px" class="selectFilter"&gt;Wiki&lt;/th&gt;
-    #end
-    &lt;th style="width:150px"&gt;Date&lt;/th&gt;
-    &lt;th style="width:150px"&gt;Last Author&lt;/th&gt;
-    #if($isScored)
-    &lt;th style="width:150px" class="noFilter"&gt;Score&lt;/th&gt;
-    #end
-    #if($xwiki.hasAdminRights())
-      &lt;th style="width:210px" class="unsortable 
noFilter"&gt;Actions&lt;/th&gt;
-    #end
-  &lt;/tr&gt;
-  #foreach ($item in $list)
-    #set($troubi = "non")
-      #if ($xwiki.hasAccessLevel("view", $context.user, 
"${context.database}:${item}"))
-        #if ($item.class == "class java.lang.String")
-          #set($bentrydoc = $xwiki.getDocument($item))
-        #elseif ($item.class == "class 
com.xpn.xwiki.plugin.lucene.SearchResult")
-          #set($bentrydoc = $item)
-        #end
-        #set($cclass = 
$xwiki.getDocument("XWiki.XWikiComments").getxWikiClass())
-        #set($comment = $cclass.newObject())
-        #if($xwiki.getWebPreferenceAsInt("commentsorder",1)==0)
-          #set($comments = $bentrydoc.getComments())
-        #else
-          #set($comments = $bentrydoc.getComments(false))
-        #end
-        #set($createur = $xwiki.getUserName($bentrydoc.author))
-        #set($ptitle = $bentrydoc.getDisplayTitle())
-        &lt;tr&gt;&lt;td style="text-align:left"&gt;
-          ## LUCENE : entries are typed
-          #if ($bentrydoc.type)
-            #set ($ptitle = 
$xwiki.getDocument("${bentrydoc.web}.${bentrydoc.name}").getDisplayTitle())
-            #if ($bentrydoc.type == "attachment")
-            &lt;a href="${bentrydoc.url}" target="_blank"&gt;&lt;img 
src="${xwiki.getSkinFile("icons/search/disk.png")}" ALT="download" /&gt; 
${bentrydoc.filename}&lt;/a&gt;\\
-           Attachment of
-            #end
-          #end
-          #if($comments &amp;&amp; $comments.size()&gt;0)
-            #set($i = 0)
-            #set($cobj = $comments.get($i))
-            #set($comment = $bentrydoc.display("comment", "view", $cobj))
-            #set($date = $cobj.getXWikiObject().get("date").value)
-            #if($date)
-              #set($date2 = $!xwiki.formatDate($date,"yyyy MM dd HH:mm:ss")  )
-            #end
-            #if($bentrydoc)
-              #set($date1 = $!xwiki.formatDate($!bentrydoc.date,"yyyy MM dd 
HH:mm:ss") )
-            #end
-            #if($date1.equals($date2) )
-              [$ptitle&gt;${bentrydoc.web}.$bentrydoc.name] &lt;em&gt;- 1 new 
comment&lt;/em&gt;
-              #set($troubi ="oui")
-              #set($desc = $cobj.getXWikiObject().get("comment").value)
-            #else
-              [$bentrydoc.name&gt;${bentrydoc.web}.$bentrydoc.name] #if 
($ptitle != $bentrydoc.name) &lt;em&gt;- $ptitle&lt;/em&gt;#end
-            #end
-          #else
-            #set($comment = "")
-            
[$bentrydoc.name&gt;${bentrydoc.web}.$bentrydoc.name.replaceAll("@","%40")] #if 
($ptitle != $bentrydoc.name) &lt;em&gt;- $ptitle&lt;/em&gt;#end
-          #end
-        &lt;/td&gt;&lt;td style="text-align:left"&gt;
-          [$bentrydoc.web&gt;${bentrydoc.web}.WebHome]
-        &lt;/td&gt;
-        #if($xwiki.isVirtual())
-          &lt;td style="text-align:left"&gt;
-            [$bentrydoc.wiki&gt;${bentrydoc.wiki}:Main.WebHome]
-          &lt;/td&gt;
-        #end
-        &lt;td style="text-align:left"&gt;
-          $xwiki.formatDate($bentrydoc.date,"yyyy MMM dd") at 
$xwiki.formatDate($bentrydoc.date,"HH:mm")&lt;/td&gt;&lt;td 
style="text-align:center"&gt;
-          #if($troubi =="oui")
-            #set($createur = $xwiki.getUserName($cobj.author)   )
-          #end
-          #if ($createur == "XWikiGuest")
-            Guest
-          #else
-            $createur
-          #end
-        &lt;/td&gt;
-        #if ($isScored)
-        &lt;td style="text-align:left"&gt;
-          #set($resval=$bentrydoc.score*100)
-          #set($starurl=$xwiki.getSkinFile("icons/search/star.png"))
-          #set($star = "&lt;img src='$starurl' alt='$resval' /&gt;")
-          &lt;span class="hidden"&gt;$bentrydoc.score&lt;/span&gt;
-          #if($resval&gt;10) $star #end
-          #if($resval&gt;20) $star #end
-          #if($resval&gt;40) $star #end
-          #if($resval&gt;60) $star #end
-          #if($resval&gt;90) $star #end
-          #set ($perc = $resval.toString())
-          ${perc.substring(0, $perc.indexOf("."))}%
-        &lt;/td&gt;
-          #set ($bentrydoc = 
$xwiki.getDocument("${bentrydoc.web}.${bentrydoc.name}"))
-        #end
-        #if($xwiki.hasAdminRights())
-          &lt;td&gt;
-            &lt;a href="$xwiki.getURL("XWiki.CopyDocument", "view", 
"sourcedoc=${bentrydoc.fullName}")"&gt;Copy&lt;/a&gt; - &lt;a 
href="$bentrydoc.getURL("delete")"&gt;Delete&lt;/a&gt; - &lt;a 
href="$bentrydoc.getURL("view", 
"xpage=rename&amp;amp;step=1")"&gt;Rename&lt;/a&gt; - &lt;a 
href="$bentrydoc.getURL("edit", "editor=rights")"&gt;Rights&lt;/a&gt;
-          &lt;/td&gt;
-        #end
-      &lt;/tr&gt;
-    #end
-  #end
-&lt;/table&gt;
+<content>#set($showdata = 0)
+#set($formatDate = "yyyy MMMM dd, HH:mm")
+
+## WARNING: Do not add any empty line inside the table element. This will 
potentially break
+## the Javascript we're using for filtering/sorting columns. It might work in 
FF but will break
+## in other browsers like IE. This is because empty lines add &lt;p 
class="paragraph"&gt;&lt;/p&gt; elements
+## when rendered.
+
+&lt;table id="searchTableUnique" class="grid sortable filterable doOddEven"&gt;
+  &lt;tr class="sortHeader"&gt;
+    &lt;th&gt;Page&lt;/th&gt;
+    &lt;th style="width:150px" class="selectFilter"&gt;Space&lt;/th&gt;
+    #if($xwiki.isVirtual())
+      &lt;th style="width:150px" class="selectFilter"&gt;Wiki&lt;/th&gt;
+    #end
+    &lt;th style="width:150px"&gt;Date&lt;/th&gt;
+    &lt;th style="width:150px"&gt;Last Author&lt;/th&gt;
+    #if($isScored)
+    &lt;th style="width:150px" class="noFilter"&gt;Score&lt;/th&gt;
+    #end
+    #if($xwiki.hasAdminRights())
+      &lt;th style="width:210px" class="unsortable 
noFilter"&gt;Actions&lt;/th&gt;
+    #end
+  &lt;/tr&gt;
+  #foreach ($item in $list)
+    #set($troubi = "non")
+    #if($item.class == "class com.xpn.xwiki.plugin.lucene.SearchResult")
+      #set($itemfullname = "${item.wiki}:${item.web}.${item.name}")
+    #else
+      #set($itemfullname = "${context.database}:${item}")
+    #end
+    #if ($xwiki.hasAccessLevel("view", $context.user, $itemfullname))
+      #if ($item.class == "class java.lang.String")
+        #set($bentrydoc = $xwiki.getDocument($item))
+      #elseif ($item.class == "class com.xpn.xwiki.plugin.lucene.SearchResult")
+        #set($bentrydoc = $item)
+      #end
+      #set($cclass = $xwiki.getDocument("XWiki.XWikiComments").getxWikiClass())
+      #set($comment = $cclass.newObject())
+      #if($xwiki.getWebPreferenceAsInt("commentsorder",1)==0)
+        #set($comments = $bentrydoc.getComments())
+      #else
+        #set($comments = $bentrydoc.getComments(false))
+      #end
+      #set($createur = $xwiki.getUserName($bentrydoc.author))
+      #set($ptitle = $bentrydoc.getDisplayTitle())
+      &lt;tr&gt;&lt;td style="text-align:left"&gt;
+        ## LUCENE : entries are typed
+        #if ($bentrydoc.type)
+          #set ($ptitle = $xwiki.getDocument($itemfullname).getDisplayTitle())
+          #if ($bentrydoc.type == "attachment")
+          &lt;a href="${bentrydoc.url}" target="_blank"&gt;&lt;img 
src="${xwiki.getSkinFile("icons/search/disk.png")}" ALT="download" /&gt; 
${bentrydoc.filename}&lt;/a&gt;\\
+           Attachment of
+          #end
+        #end
+        #if($comments &amp;&amp; $comments.size()&gt;0)
+          #set($i = 0)
+          #set($cobj = $comments.get($i))
+          #set($comment = $bentrydoc.display("comment", "view", $cobj))
+          #set($date = $cobj.getXWikiObject().get("date").value)
+          #if($date)
+            #set($date2 = $!xwiki.formatDate($date,"yyyy MM dd HH:mm:ss")  )
+          #end
+          #if($bentrydoc)
+            #set($date1 = $!xwiki.formatDate($!bentrydoc.date,"yyyy MM dd 
HH:mm:ss") )
+          #end
+          #if($date1.equals($date2) )
+            [$ptitle&gt;$itemfullname] &lt;em&gt;- 1 new comment&lt;/em&gt;
+            #set($troubi ="oui")
+            #set($desc = $cobj.getXWikiObject().get("comment").value)
+          #else
+            [$bentrydoc.name&gt;$itemfullname] #if ($ptitle != 
$bentrydoc.name) &lt;em&gt;- $ptitle&lt;/em&gt;#end
+          #end
+        #else
+          #set($comment = "")
+          [$bentrydoc.name&gt;$itemfullname] #if ($ptitle != $bentrydoc.name) 
&lt;em&gt;- $ptitle&lt;/em&gt;#end
+        #end
+      &lt;/td&gt;
+      &lt;td style="text-align:left"&gt;
+        [$bentrydoc.web&gt;${bentrydoc.wiki}:${bentrydoc.web}.WebHome]
+      &lt;/td&gt;
+      #if($xwiki.isVirtual())
+        &lt;td style="text-align:left"&gt;
+          [$bentrydoc.wiki&gt;${bentrydoc.wiki}:Main.WebHome]
+        &lt;/td&gt;
+      #end
+      &lt;td style="text-align:left"&gt;
+        $xwiki.formatDate($bentrydoc.date,"yyyy MMM dd") at 
$xwiki.formatDate($bentrydoc.date,"HH:mm")&lt;/td&gt;&lt;td 
style="text-align:center"&gt;
+        #if($troubi =="oui")
+          #set($createur = $xwiki.getUserName($cobj.author)   )
+        #end
+        #if ($createur == "XWikiGuest")
+          Guest
+        #else
+          $createur
+        #end
+      &lt;/td&gt;
+      #if ($isScored)
+        &lt;td style="text-align:left"&gt;
+          #set($resval=$bentrydoc.score*100)
+          #set($starurl=$xwiki.getSkinFile("icons/search/star.png"))
+          #set($star = "&lt;img src='$starurl' alt='$resval' /&gt;")
+          &lt;span class="hidden"&gt;$bentrydoc.score&lt;/span&gt;
+          #if($resval&gt;10) $star #end
+          #if($resval&gt;20) $star #end
+          #if($resval&gt;40) $star #end
+          #if($resval&gt;60) $star #end
+          #if($resval&gt;90) $star #end
+          #set ($perc = $resval.toString())
+          ${perc.substring(0, $perc.indexOf("."))}%
+        &lt;/td&gt;
+        #set ($bentrydoc = $xwiki.getDocument($itemfullname))
+      #end
+      #if($xwiki.hasAdminRights())
+        &lt;td&gt;
+          &lt;a href="$xwiki.getURL("XWiki.CopyDocument", "view", 
"sourcedoc=${xwiki.getURLEncoded($itemfullname)}")"&gt;Copy&lt;/a&gt; - &lt;a 
href="$bentrydoc.getURL("delete")"&gt;Delete&lt;/a&gt; - &lt;a 
href="$bentrydoc.getURL("view", 
"xpage=rename&amp;amp;step=1")"&gt;Rename&lt;/a&gt; - &lt;a 
href="$bentrydoc.getURL("edit", "editor=rights")"&gt;Rights&lt;/a&gt;
+        &lt;/td&gt;
+      #end
+      &lt;/tr&gt;
+    #end
+  #end
+&lt;/table&gt;
 </content></xwikidoc>
\ No newline at end of file

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

[xwiki-notifications] r6353 - xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki

Reply via email to