incubator-esme-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From esjew...@apache.org
Subject svn commit: r1033022 - in /incubator/esme/trunk/server/src/main: scala/org/apache/esme/lib/SearchMgr.scala webapp/info_view/search.html
Date Tue, 09 Nov 2010 15:26:52 GMT
Author: esjewett
Date: Tue Nov  9 15:26:52 2010
New Revision: 1033022

URL: http://svn.apache.org/viewvc?rev=1033022&view=rev
Log:
[ESME-305] Fixes search in local build - I had broken it when refactoring the message_core.html
template.

Modified:
    incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala
    incubator/esme/trunk/server/src/main/webapp/info_view/search.html

Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala?rev=1033022&r1=1033021&r2=1033022&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala (original)
+++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/SearchMgr.scala Tue Nov
 9 15:26:52 2010
@@ -59,14 +59,14 @@ object SearchMgr {
   
   def displaySearch(in: NodeSeq): NodeSeq = {
 
-    val jsId = "timeline_messages";
+    val jsId = "search_timeline_messages";
     
     {Script(
       (for (term <- S.param("term");
            user <- User.currentUser)
       yield {
 
-        val msgs = Message.search(term, user.following, 50)
+        val msgs = Message.search(term, user.following, 50)    
         OnLoad(JsCrVar(jsId, JsArray(
             msgs.map(m => JsObj(("message", m.asJs)) ) :_*)) &
         JsFunc("displayMessages", JsVar(jsId), jsId).cmd)

Modified: incubator/esme/trunk/server/src/main/webapp/info_view/search.html
URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/webapp/info_view/search.html?rev=1033022&r1=1033021&r2=1033022&view=diff
==============================================================================
--- incubator/esme/trunk/server/src/main/webapp/info_view/search.html (original)
+++ incubator/esme/trunk/server/src/main/webapp/info_view/search.html Tue Nov  9 15:26:52
2010
@@ -17,22 +17,19 @@
  under the License.                                           *
 -->
 <lift:surround with="base" at="left">
-       <div id="back-header">
-            <div id="left">
-                  <h1>
-                        <lift:loc>ui_messages_search_for</lift:loc>
-                        <i>
-                              <lift:searchTerm/>
-                        </i>
-                  </h1>
-                  <div class="container-public">
-                        <!--updates-box -->
-                        <lift:displaySearch/>
-                        <lift:embed what="templates-hidden/message_core"/>
-                  </div>
-                  <!--updates-box-->
-                  </div>
-            <!-- End demo -->
-            </div>
+  <div id="back-header">
+    <div id="left">
+      <h1>
+        <lift:loc>ui_messages_search_for</lift:loc>
+        <i><lift:searchTerm/></i> 
+      </h1>
+      <div class="container-public">
+        <lift:displaySearch/> 
+        <div id="search_timeline_messages">
+          <lift:embed what="templates-hidden/message_core"/>        
+        </div>
+      </div>     
+    </div>  
+  </div>     
 </lift:surround>
 



Mime
View raw message