* fix search in mailbox view

* fix nodename in message display

diff --git a/webcit/messages.c b/webcit/messages.c
index b679a5ebb4c006b1e7233aa6d441e7c683f1edc8..9153eaa8d51493b92c9b87cecc1c5e2dbbd67643 100644 (file)
--- a/webcit/messages.c
+++ b/webcit/messages.c
@@ -1655,7 +1655,9 @@ void new_summary_view(void) {
 void jsonMessageList(void) {
   const StrBuf *room = sbstr("room");
   WC->is_ajax = 1; 
-  smart_goto(room);
+  long oper = (havebstr("query")) ? do_search : readnew;
+  gotoroom(room);
+  readloop(oper);
   WC->is_ajax = 0;
 }
 

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 15a02df2c8ac2360d355da9a208c0dcaab0d0cb0..b19e7efbde7181a00bbe5eae6a332e04fd45132a 100644 (file)
--- a/webcit/static/summaryview.js
+++ b/webcit/static/summaryview.js
@@ -157,11 +157,12 @@ function loadMessages(transport) {
   if (!is_safe_mode) {
   resortAndDisplay(sortRowsByDateDescending);
   } else {
+    setupPageSelector();
     resortAndDisplay(null);
   }
-  loadingMsg.parentNode.removeChild(loadingMsg);
-  setupPageSelector();
-  query = "";
+  if (loadingMsg.parentNode != null) {
+    loadingMsg.parentNode.removeChild(loadingMsg);
+  }
 }
 function resortAndDisplay(sortMode) {
   var start = new Date();
@@ -482,6 +483,7 @@ function setupPageSelector() {
 function getPage(event) {
   var target = event.target;
   startmsg = target.options.item(target.selectedIndex).value;
+  //query = ""; // We are getting a page from the _entire_ msg list, don't query
   getMessages();
 }
 function takeOverSearchOMatic() {

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index 93e781029f04feaf7c9bdf5e56fdb3944196cb09..35b59e9aa7eeb3a7a0cf4094a00b90229f854470 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -7,7 +7,7 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
  <?_("from ")>
  <??("COND:MAIL:ANON",1)>
 <?!("COND:MAIL:SUMM:RFCA", 2)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>">"<?MAIL:SUMM:FROM("X")>" &lt;<?MAIL:SUMM:RFCA>&gt;</a><?!("X", 2)>
-<??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> @ <?SERV:NODENAME><??("X", 3)>
+<??("COND:MAIL:SUMM:RFCA", 3)><a href="showuser?who=<?MAIL:SUMM:FROM("Q")>"><?MAIL:SUMM:FROM("X")></a> <??("X", 3)><?!("COND:MAIL:SUMM:OTHERNODE",3)> @ <?MAIL:SUMM:H_NODE><??("X",3)>
 <??("X", 1)>
  <?!("COND:MAIL:ANON", 4)>***<??("X", 4)>
  <p style="visibility: hidden;" id="msg<?MAIL:SUMM:N>" class="msgbuttons">