Merge pull request #1626 from Shadow243/fix-refresh-with-pagination

fix(frontend): send correct page to Hm_MessagesStore while refreshing…

Author: kroky

modules/core/js_modules/actions/pagination.js

@@ -20,7 +20,7 @@ async function nextPage() {
 
     const nextPage = parseInt(currentPage) + 1;
 
-    const store = new Hm_MessagesStore(getListPathParam(), currentPage, `${getParam('keyword')}_${getParam('filter')}`, getParam('sort'));
+    const store = new Hm_MessagesStore(getListPathParam(), nextPage, `${getParam('keyword')}_${getParam('filter')}`, getParam('sort'));
     store.load(false, false, true);
 
     await changePage(nextPage, this);
@@ -32,7 +32,7 @@ async function previousPage() {
     const previousPage = parseInt(currentPage) - 1;
 
     if (previousPage > 1) {
-        const store = new Hm_MessagesStore(getListPathParam(), previousPage - 1, `${getParam('keyword')}_${getParam('filter')}`, getParam('sort'));
+        const store = new Hm_MessagesStore(getListPathParam(), previousPage, `${getParam('keyword')}_${getParam('filter')}`, getParam('sort'));
         store.load(false, false, true);
     }
 

modules/desktop_notifications/site.js

@@ -22,7 +22,7 @@ $(function() {
     // refresh the unread messages state
     setInterval(() => {
         // undefined_undefined: load with no filter and no keyword
-        new Hm_MessagesStore('unread', 1, 'undefined_undefined').load(true, true).then((store) => {
+        new Hm_MessagesStore('unread', getParam('list_page') || 1, 'undefined_undefined').load(true, true).then((store) => {
             store.newMessages.forEach((messageRow) => {
                 triggerNewMessageEvent($(messageRow).data('uid'), $(messageRow)[0]);
             });

modules/imap/site.js

@@ -481,7 +481,7 @@ var setup_imap_folder_page = async function(listPath, listPage = 1) {
 
     // Refresh in the background each 60 seconds
     const interval = setInterval(async () => {
-        select_imap_folder(listPath, 1, true, true);
+        select_imap_folder(listPath, getParam('list_page') || 1, true, true);
     }, 60000);
 
     // Return cleanup function to clear interval when page unmounts