[incubator-ponymail-foal] 01/04: make calendar click utilize previous search parameters

[humbedooh]

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 edbbd15a06053109263fb706432cc3eacc0d5dda
Author: Daniel Gruno <humbed...@apache.org>
AuthorDate: Tue Sep 21 15:11:44 2021 -0500

    make calendar click utilize previous search parameters
---
 webui/js/source/sidebar-calendar.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webui/js/source/sidebar-calendar.js 
b/webui/js/source/sidebar-calendar.js
index 56f5562..c62b7bc 100644
--- a/webui/js/source/sidebar-calendar.js
+++ b/webui/js/source/sidebar-calendar.js
@@ -166,11 +166,16 @@ function calendar_click(year, month) {
     current_month = month;
     searching = false;
     let q = "";
-    let newhref = "list.html?%s@%s:%u-%u".format(current_list, current_domain, 
year, month);
+    let calendar_current_list = current_list;
+    let calendar_current_domain = current_domain;
     if (current_json && current_json.searchParams && 
current_json.searchParams.q) {
         q = current_json.searchParams.q;
-        newhref += ":" + q;
+        calendar_current_list = current_json.searchParams.list;
+        calendar_current_domain = current_json.searchParams.domain;
     }
+    let newhref = "list?%s@%s:%u-%u".format(calendar_current_list, 
calendar_current_domain, year, month);
+    if (q && q.length > 0) newhref += ":" + q;
+
     if (location.href !== newhref) {
         window.history.pushState({}, null, newhref);
     }