[Bps-public-commit] rtx-calendar branch allow-custom-field-based-events-2 updated. 1.05-12-gd948f47

[BPS Git Server]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "rtx-calendar".

The branch, allow-custom-field-based-events-2 has been updated
       via  d948f4745b89f7ea68e99b0deb94091686b3efb4 (commit)
      from  76cdfa4cfdfcfd134e40e2e2c8b751f832758708 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d948f4745b89f7ea68e99b0deb94091686b3efb4
Author: Ronaldo Richieri <ronaldo at bestpractical.com>
Date:   Thu Aug 31 19:47:38 2023 -0300

    Fix Filter on Status moving to current Month
    
    When viewing different month than current, when filtering on status,
    the user was taken back to the current month. Fixed by adding hidden
    inputs to the filter on status form.
    
    Also fix loosing the filter on status when changing month.

diff --git a/html/Search/Calendar.html b/html/Search/Calendar.html
index 1202e09..56fcee3 100644
--- a/html/Search/Calendar.html
+++ b/html/Search/Calendar.html
@@ -31,8 +31,14 @@ $FilterOnStatusClear => undef
     &>
 
   <form id="FilterOnStatusForm"
-  action="<%$RT::WebPath%>/Search/Calendar.html?<%$QueryString%>" method="post">
+  action="<%$RT::WebPath%>/Search/Calendar.html" method="post">
   <input type="hidden" name="BaseQuery" value="<%$BaseQuery%>" />
+  <input type="hidden" name="Month" value="<%$Month%>" />
+  <input type="hidden" name="Year" value="<%$Year%>" />
+  <input type="hidden" name="Format" value="<%$Format%>" />
+  <input type="hidden" name="Order" value="<%$Order%>" />
+  <input type="hidden" name="OrderBy" value="<%$OrderBy%>" />
+  <input type="hidden" name="RowsPerPage" value="<%$RowsPerPage%>" />
   <select name="FilterOnStatus" id="FilterOnStatus"
     class="selectpicker filteronstatus mt-3 mb-3" multiple="multiple" size="6">
 % for my $Status (sort {loc($a) cmp loc($b)} @{RT->Config->Get('CalendarFilterStatuses')}) {
@@ -293,6 +299,7 @@ my $QueryString =
       $m->comp(
         '/Elements/QueryString',
         Query   => $BaseQuery,
+        FilterOnStatus => \@FilterOnStatus,
         Format  => $Format,
         Order   => $Order,
         OrderBy => $OrderBy,

-----------------------------------------------------------------------

Summary of changes:
 html/Search/Calendar.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
rtx-calendar