[xwiki-notifications] r6087 - xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/Main

[SVN]

Author: tmortagne
Date: 2007-11-27 11:02:04 +0100 (Tue, 27 Nov 2007)
New Revision: 6087

Modified:
   
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/Main/LuceneSearch
Log:
XE-151: Add multiwiki concept to Lucene search page
Forgot some #if in non virtual mode.

Modified: 
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/Main/LuceneSearch
===================================================================
--- 
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/Main/LuceneSearch
     2007-11-26 17:59:12 UTC (rev 6086)
+++ 
xwiki-products/xwiki-enterprise/branches/xwiki-enterprise-1.1/wiki/src/main/resources/Main/LuceneSearch
     2007-11-27 10:02:04 UTC (rev 6087)
@@ -12,9 +12,9 @@
 <customClass></customClass>
 <contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1186588178000</creationDate>
-<date>1196096807000</date>
-<contentUpdateDate>1196096807000</contentUpdateDate>
-<version>1.87</version>
+<date>1196157462000</date>
+<contentUpdateDate>1196157462000</contentUpdateDate>
+<version>1.104</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
@@ -132,10 +132,6 @@
   #end
   #set($wikinames = $wikinames + $wikiname)
 #end
-#if($wikinamelist.size() == 0)
-##  #set($ok = $wikinamelist.add($context.mainWikiName))
-  #set($wikinames = $xwiki.null)
-#end
 #if($xwiki.isVirtual())
   #set($allwikilist = $xwiki.searchDocuments(", BaseObject as obj, 
StringProperty as prop where doc.fullName=obj.name and 
obj.className='XWiki.XWikiServerClass' and prop.id.id=obj.id and 
prop.id.name='server'"))
   #set($allwikinamelist = [])
@@ -159,6 +155,10 @@
       #end
     &lt;/select&gt;
   #end
+#else
+  #if($wikinames == "")
+    #set($wikinames = $context.mainWikiName)
+  #end
 #end
 ## ---------------
 ## Query preparation
@@ -187,7 +187,7 @@
 ## ---------------
 &lt;form action="$doc.name" method="get"&gt;
 &lt;div class="centered"&gt;
-Query &lt;input type="text" name="text" value="$query" /&gt; in space 
#spaceselect($space $spaces $spacesText) in wikis 
#wikinamesselect($xwiki.sort($allwikinamelist) $wikinamelist) &lt;input 
type="submit" value="Search"/&gt;
+Query &lt;input type="text" name="text" value="$query" /&gt; in space 
#spaceselect($space $spaces $spacesText)#if($xwiki.isVirtual()) in wikis 
#wikinamesselect($xwiki.sort($allwikinamelist) $wikinamelist)#end &lt;input 
type="submit" value="Search"/&gt;
 &lt;/div&gt;
 &lt;/form&gt;
 #end

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