Fixed filter counts in combination with sorting

GsAimeos · Dec 1, 2019 · 4d777fc · 4d777fc
1 parent c73448e
commit 4d777fc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/client/html/src/Client/Html/Catalog/Count/Attribute/Standard.php b/client/html/src/Client/Html/Catalog/Count/Attribute/Standard.php
@@ -251,17 +251,20 @@ public function addData( \Aimeos\MW\View\Iface $view, array &$tags = [], &$expir
 			 * @category User
 			 */
 			$limit = $config->get( 'client/html/catalog/count/limit', 10000 );
+
 			$startid = $view->config( 'client/html/catalog/filter/tree/startid' );
 			$level = $view->config( 'client/html/catalog/lists/levels', \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
+			$sort = $view->param( 'f_sort', $config->get( 'client/html/catalog/lists/sort', 'relevance' ) );
 
 			$cntl = \Aimeos\Controller\Frontend::create( $context, 'product' )
+				->sort( $sort ) // prioritize user sorting over the sorting through category
 				->category( $view->param( 'f_catid', $startid ), 'default', $level )
 				->supplier( $view->param( 'f_supid', [] ) )
 				->allof( $view->param( 'f_attrid', [] ) )
 				->oneOf( $view->param( 'f_optid', [] ) )
 				->oneOf( $view->param( 'f_oneid', [] ) )
 				->text( $view->param( 'f_search' ) )
-				->slice( 0, $limit )->sort();
+				->slice( 0, $limit );
 
 			$view->attributeCountList = $cntl->aggregate( 'index.attribute.id' );
 		}

diff --git a/client/html/src/Client/Html/Catalog/Count/Supplier/Standard.php b/client/html/src/Client/Html/Catalog/Count/Supplier/Standard.php
@@ -250,17 +250,20 @@ public function addData( \Aimeos\MW\View\Iface $view, array &$tags = [], &$expir
 			 * @category User
 			 */
 			$limit = $config->get( 'client/html/catalog/count/limit', 10000 );
+
 			$startid = $view->config( 'client/html/catalog/filter/tree/startid' );
 			$level = $view->config( 'client/html/catalog/lists/levels', \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
+			$sort = $view->param( 'f_sort', $config->get( 'client/html/catalog/lists/sort', 'relevance' ) );
 
 			$cntl = \Aimeos\Controller\Frontend::create( $context, 'product' )
+				->sort( $sort ) // prioritize user sorting over the sorting through category
 				->category( $view->param( 'f_catid', $startid ), 'default', $level )
 				->supplier( $view->param( 'f_supid', [] ) )
 				->allof( $view->param( 'f_attrid', [] ) )
 				->oneOf( $view->param( 'f_optid', [] ) )
 				->oneOf( $view->param( 'f_oneid', [] ) )
 				->text( $view->param( 'f_search' ) )
-				->slice( 0, $limit )->sort();
+				->slice( 0, $limit );
 
 			$view->supplierCountList = $cntl->aggregate( 'index.supplier.id' );
 		}

diff --git a/client/html/src/Client/Html/Catalog/Count/Tree/Standard.php b/client/html/src/Client/Html/Catalog/Count/Tree/Standard.php
@@ -229,6 +229,7 @@ public function addData( \Aimeos\MW\View\Iface $view, array &$tags = [], &$expir
 			$limit = $config->get( 'client/html/catalog/count/limit', 10000 );
 			$startid = $view->config( 'client/html/catalog/filter/tree/startid' );
 			$level = $view->config( 'client/html/catalog/lists/levels', \Aimeos\MW\Tree\Manager\Base::LEVEL_LIST );
+			$sort = $view->param( 'f_sort', $config->get( 'client/html/catalog/lists/sort', 'relevance' ) );
 
 			$cntl = \Aimeos\Controller\Frontend::create( $context, 'catalog' )->root( $startid );
 			$root = $cntl->getTree( \Aimeos\MW\Tree\Manager\Base::LEVEL_ONE );
@@ -241,13 +242,14 @@ public function addData( \Aimeos\MW\View\Iface $view, array &$tags = [], &$expir
 
 			$tree = $cntl->getTree();
 			$cntl = \Aimeos\Controller\Frontend::create( $context, 'product' )
+				->sort( $sort ) // prioritize user sorting over the sorting through category
 				->category( array_keys( $tree->toList() ) )
 				->supplier( $view->param( 'f_supid', [] ) )
 				->allof( $view->param( 'f_attrid', [] ) )
 				->oneOf( $view->param( 'f_optid', [] ) )
 				->oneOf( $view->param( 'f_oneid', [] ) )
 				->text( $view->param( 'f_search' ) )
-				->slice( 0, $limit )->sort();
+				->slice( 0, $limit );
 
 			$view->treeCountList = $cntl->aggregate( 'index.catalog.id' );