[incubator-ponymail-foal] 01/02: set list and domain earlier so we can catch whether custom search tab needs list labels

[hu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git

commit d024a91da7ae36b88a9a59d2bda365e7b6498c2e
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Dec 10 17:52:06 2021 +0100

    set list and domain earlier so we can catch whether custom search tab needs list labels
---
 webui/js/source/listview-header.js | 6 +++++-
 webui/js/source/search.js          | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/webui/js/source/listview-header.js b/webui/js/source/listview-header.js
index 1a7dea0..7b3192d 100644
--- a/webui/js/source/listview-header.js
+++ b/webui/js/source/listview-header.js
@@ -229,6 +229,7 @@ function listview_list_lists(state, json) {
         }, "Search: %s".format(state.query));
         li.setAttribute("data-url", state.url);
         li.setAttribute("data-href", location.href);
+        li.setAttribute("data-list", '%s@%s'.format(state.list, state.domain));
         lists.inject(li);
     }
 
@@ -297,8 +298,12 @@ function switch_project(domain) {
 function switch_list(list, from) {
     let listid = list;
     if (typeof list == 'object') {
+        listid = list.getAttribute("data-list") || list.innerText;
         let dataURL = list.getAttribute('data-url');
         if (dataURL) {
+            let bits = listid.split("@");
+            G_current_list = bits[0];
+            G_current_domain = bits[1];
             GET(dataURL, renderListView, {
                 search: true,
                 cached: true
@@ -312,7 +317,6 @@ function switch_list(list, from) {
             });
             return;
         }
-        listid = list.getAttribute("data-list") || list.innerText;
     }
     let bits = listid.split("@");
     G_current_list = bits[0];
diff --git a/webui/js/source/search.js b/webui/js/source/search.js
index 8bf629a..b334996 100644
--- a/webui/js/source/search.js
+++ b/webui/js/source/search.js
@@ -30,6 +30,8 @@ function search(query, date) {
     }
 
     let listid = '%s@%s'.format(list, domain);
+    G_current_list = list;
+    G_current_domain = domain;
     let newhref = "list?%s:%s:%s".format(listid, date, query);
 
     let header_from = document.getElementById('header_from');
@@ -56,7 +58,9 @@ function search(query, date) {
     listview_list_lists({
         url: sURL,
         search: true,
-        query: query
+        query: query,
+        list: list,
+        domain: domain
     });
     hideWindows(true);
     document.getElementById('q').value = query;