Merge branch 'bugfix/pagination' into 'master'

Bugfix/pagination

See merge request pdir/maklermodul-bundle!34

CHANGELOG.md

@@ -10,7 +10,12 @@ Types of changes
     Security in case of vulnerabilities.
 )
 
-## [2.9.4](https://github.com/pdir/maklermodul-bundle/tree/2.9.4) – 2024-xx-xx
+## [2.9.5](https://github.com/pdir/maklermodul-bundle/tree/2.9.5) – 2024-11-07
+
+- [Fixed] fix pagination after resetting the filter
+- [Fixed] fix number of pagination items
+
+## [2.9.4](https://github.com/pdir/maklermodul-bundle/tree/2.9.4) – 2024-11-04
 
 - [Fixed] show attachments if group is empty
 

src/Module/ListView.php

@@ -311,7 +311,7 @@ protected function compile()
             $pages[] = $json['data'];
         }
 
-        $this->Template->pageCount = $pageCount;
+        $this->Template->pageCount = ceil(($count - 1) / $this->makler_paginationCount);
         $this->Template->page = !(int) $this->Input->get('page') ? (int) $this->Input->get('page') : 0;
         $this->Template->listObjects = $json['data'] ? $pages : null;
 

src/Resources/public/js/estate.js

@@ -393,8 +393,7 @@
     delete listView.qsSelector;
     delete listView.selectFilter;
     delete listView.qsString;
-
-    listView.pagination.show();
+    listView.resetPagination();
 
     // reset range
     delete listView.rangeFilter;
@@ -409,6 +408,13 @@
     listView.filter("*");
   };
 
+  listView.resetPagination = function () {
+    listView.pagination.show();
+    listView.pagination.find('li').removeClass('active');
+    listView.pagination.find('li:first-child').addClass('active');
+    listView.activePage.html(listView.pagination.find('li:first-child a').text());
+  };
+
   listView.shuffle = function () {
     listView.estateList.isotope('shuffle');
   };
@@ -498,10 +504,12 @@
       filters = filters.join('');     //AND
     }
 
-    if (filters === '')
+    if (filters === '') {
       delete listView.checkboxFilter;
-    else
+      listView.resetPagination();
+    } else {
       listView.checkboxFilter = filters;
+    }
 
     // call filter
     listView.filter();
@@ -536,10 +544,12 @@
       filters = filters.join('');     //AND
     }
 
-    if (filters === '')
+    if (filters === '') {
       delete listView.selectFilter;
-    else
+      listView.resetPagination();
+    } else {
       listView.selectFilter = filters;
+    }
 
     listView.selectFilter = filters;
 
@@ -678,7 +688,7 @@
     // @todo deactivate via modul $('html,body').animate({ scrollTop: $("#slider .mod_article.last").offset().top - 85 }, 600);
 
     // update active pagination page
-    listView.activePage.html($(this).attr('title'));
+    listView.activePage.html($(this).text());
 
     listView.filter();
   };

src/Util/Helper.php

@@ -39,7 +39,7 @@ class Helper extends Frontend
     /**
      * maklermodul version.
      */
-    const VERSION = '2.9.4';
+    const VERSION = '2.9.5';
 
     /**
      * Extension mode.