[-] FO : Follow up #2458

PrestaShop · Feb 9, 2015 · 2cae1ac · 2cae1ac
1 parent 7e57f40
commit 2cae1ac
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/themes/default-bootstrap/product-sort.tpl b/themes/default-bootstrap/product-sort.tpl
@@ -32,21 +32,23 @@
 {if !isset($request)}
 	<!-- Sort products -->
 	{if isset($smarty.get.id_category) && $smarty.get.id_category}
-		{assign var='request' value=$link->getPaginationLink('category', $category, false, true)}
-	{elseif isset($smarty.get.id_manufacturer) && $smarty.get.id_manufacturer}
+		{assign var='request' value=$link->getPaginationLink('category', $category, false, true)
+}	{elseif isset($smarty.get.id_manufacturer) && $smarty.get.id_manufacturer}
 		{assign var='request' value=$link->getPaginationLink('manufacturer', $manufacturer, false, true)}
 	{elseif isset($smarty.get.id_supplier) && $smarty.get.id_supplier}
 		{assign var='request' value=$link->getPaginationLink('supplier', $supplier, false, true)}
 	{else}
 		{assign var='request' value=$link->getPaginationLink(false, false, false, true)}
 	{/if}
 {/if}
+{$orderby}
+{$orderway}
 {if $page_name == 'best-sales' && (!isset($smarty.get.orderby) || empty($smarty.get.orderby))}{$orderby = ''}{$orderbydefault = ''}{/if}
 <form id="productsSortForm{if isset($paginationId)}_{$paginationId}{/if}" action="{$request|escape:'html':'UTF-8'}" class="productsSortForm">
 	<div class="select selector1">
 		<label for="selectProductSort{if isset($paginationId)}_{$paginationId}{/if}">{l s='Sort by'}</label>
 		<select id="selectProductSort{if isset($paginationId)}_{$paginationId}{/if}" class="selectProductSort form-control">
-			<option value="{if $page_name != 'best-sales'}{$orderbydefault|escape:'html':'UTF-8'}:{$orderwaydefault|escape:'html':'UTF-8'}{/if}"{if $orderby eq $orderbydefault} selected="selected"{/if}>--</option>
+			<option value="{if $page_name != 'best-sales'}{$orderbydefault|escape:'html':'UTF-8'}:{$orderwaydefault|escape:'html':'UTF-8'}{/if}"{if !in_array($orderby, array('price', 'name', 'quantity', 'reference')) && $orderby eq $orderbydefault} selected="selected"{/if}>--</option>
 			{if !$PS_CATALOG_MODE}
 				<option value="price:asc"{if $orderby eq 'price' AND $orderway eq 'asc'} selected="selected"{/if}>{l s='Price: Lowest first'}</option>
 				<option value="price:desc"{if $orderby eq 'price' AND $orderway eq 'desc'} selected="selected"{/if}>{l s='Price: Highest first'}</option>