Merge pull request #1670 from mercihabam/fix-sort-page

fix(frontend): keep track keep track of current page number when sorting, and display correct sort value when reloading

Author: kroky

modules/core/handler_modules.php

@@ -230,8 +230,7 @@ class Hm_Handler_default_sort_order_setting extends Hm_Handler_Module {
      */
     public function process() {
         $this->out('default_sort_order', $this->user_config->get('default_sort_order_setting', 'arrival'));
-        $this->out('sort', $this->request->get['sort'] ?? null);
-        $this->out('list_sort', $this->request->get['list_sort'] ?? null);
+        $this->out('list_sort', $this->request->get['sort'] ?? null);
     }
 }
 

modules/core/js_modules/actions/pagination.js

@@ -27,7 +27,7 @@ async function nextPage() {
 }
 
 async function previousPage() {
-    const currentPage = $(".pagination .current:first").text();
+    const currentPage = $(".pagination .current").first().text();
 
     const previousPage = parseInt(currentPage) - 1;
 

modules/core/message_list_functions.php

@@ -145,8 +145,8 @@ function combined_sort_dialog($mod) {
 
     $res = '<select name="sort" style="width: 150px" class="combined_sort form-select form-select-sm ms-2">';
     foreach ($sorts as $name => $val) {
-        $res .= '<option value="'.$name.'"'.($mod->get('sort') == $name || $mod->get('list_sort') == $name ? ' selected' : '').'>'.$val.' &darr;</option>';
-        $res .= '<option value="-'.$name.'"'.($mod->get('sort') == '-'.$name || $mod->get('list_sort') == '-'.$name ? ' selected' : '').'>'.$val.' &uarr;</option>';
+        $res .= '<option value="'.$name.'"'.($mod->get('list_sort') == $name ? ' selected' : '').'>'.$val.' &darr;</option>';
+        $res .= '<option value="-'.$name.'"'.($mod->get('list_sort') == '-'.$name ? ' selected' : '').'>'.$val.' &uarr;</option>';
     }
     $res .= '</select>';
     return $res;

modules/imap/output_modules.php

@@ -38,6 +38,7 @@ protected function output() {
             $custom = '<form id="imap_filter_form" method="GET" class="d-flex align-content-center">';
             $custom .= '<input type="hidden" name="page" value="message_list" />';
             $custom .= '<input type="hidden" name="list_path" value="'.$this->html_safe($this->get('list_path')).'" />';
+            $custom .= '<input type="hidden" name="list_page" value="'.$this->html_safe($this->get('list_page')).'" />';
             $custom .= '<input type="search" placeholder="'.$this->trans('Search').
                 '" class="imap_keyword form-control form-control-sm" name="keyword" value="'.$this->html_safe($keyword).'" />';
             $custom .= '<select name="sort" class="imap_sort form-control form-control-sm">';