From 9e1f5bee7a9743b18d9143ce884fb1871ec0d1a1 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Thu, 19 Jan 2012 15:58:03 +0000 Subject: [PATCH] // Fixed bugs with blocklayered and no categories seletected + fix problems with tree categories + fix problems with smarty2 --- modules/blocklayered/blocklayered.php | 142 ++++++++++++++++++++------ modules/blocklayered/blocklayered.tpl | 44 ++++---- modules/blocklayered/config.xml | 2 +- modules/blocklayered/fr.php | 2 + 4 files changed, 139 insertions(+), 51 deletions(-) diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 67a335a79..eeab5522b 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -20,7 +20,7 @@ * * @author PrestaShop SA * @copyright 2007-2011 PrestaShop SA -* @version Release: $Revision: 12319 $ +* @version Release: $Revision: 12553 $ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registred Trademark & Property of PrestaShop SA */ @@ -39,7 +39,7 @@ class BlockLayered extends Module { $this->name = 'blocklayered'; $this->tab = 'front_office_features'; - $this->version = '1.7.5'; + $this->version = '1.7.6'; $this->author = 'PrestaShop'; $this->need_instance = 0; @@ -1249,6 +1249,7 @@ class BlockLayered extends Module $sqlToInsert = 'INSERT INTO '._DB_PREFIX_.'layered_category (id_category, id_shop, id_value, type, position, filter_show_limit, filter_type) VALUES '; + $values = false; foreach ($_POST['categoryBox'] as $id_category_layered) { $n = 0; @@ -1256,6 +1257,7 @@ class BlockLayered extends Module foreach ($_POST as $key => $value) if (substr($key, 0, 17) == 'layered_selection' && $value == 'on') { + $values = true; $type = 0; $limit = 0; if (Tools::getValue($key.'_filter_type')) @@ -1291,8 +1293,8 @@ class BlockLayered extends Module } } } - - Db::getInstance()->Execute(rtrim($sqlToInsert, ',')); + if ($values) + Db::getInstance()->Execute(rtrim($sqlToInsert, ',')); $valuesToInsert = array( 'name' => pSQL(Tools::getValue('layered_tpl_name')), @@ -1593,9 +1595,15 @@ class BlockLayered extends Module #layered_container_left ul li { cursor: move; position: relative; } #layered-cat-counter { display: none; } #layered-step-2, #layered-step-3 { display: none; } + #layered-step-2 h3 { margin-top: 0; } #table-filter-templates tr th, #table-filter-templates tr td { text-align: center; } .filter_type { width: 70px; position: absolute; right: 53px; top: 5px;} .filter_show_limit { position: absolute; width: 40px; right: 5px; top: 5px; } + #layered-step-3 .alert { width: auto; } + #fancybox-content { + height: 400px !important; + overflow: auto !important; + }
'; @@ -1649,12 +1657,11 @@ class BlockLayered extends Module $root_category = array('id_category' => '0', 'name' => $this->l('Root')); } else - { - $root_category = array('id_category' => '1', 'name' => $this->l('Home')); - } + $root_category = ''; + $trads = array( 'Root' => $root_category, - 'Home' => $root_category, // for retrocompatibility 1.4 + 'Home' => $this->l('Home'), // for retrocompatibility 1.4 'selected' => $this->l('selected'), 'Collapse All' => $this->l('Collapse All'), 'Expand All' => $this->l('Expand All'), @@ -1703,17 +1710,28 @@ class BlockLayered extends Module } - $html .= ' - {else if $filter.filter_type == 1} + {else} + {if $filter.filter_type == 1}
  • {l s='From' mod='blocklayered'} {$filter.unit} @@ -172,8 +175,8 @@ param_product_url = ''; {/literal}
    • - {else} - {foreach $filter.list_of_values as $values} + {else} + {foreach from=$filters.list_of_values item=values}
  • - {l s='From' mod='blocklayered'} {$values[0]} {$filter.unit} {l s='to' mod='blocklayered'} {$values[1]} {$filter.unit}
    • @@ -182,6 +185,7 @@ param_product_url = ''; + {/if} {/if} {/if} {if count($filter.values) > $filter.filter_show_limit && $filter.filter_show_limit > 0 && $filter.filter_type != 2} diff --git a/modules/blocklayered/config.xml b/modules/blocklayered/config.xml index bd97f5c43..d5a0b062d 100644 --- a/modules/blocklayered/config.xml +++ b/modules/blocklayered/config.xml @@ -2,7 +2,7 @@ blocklayered - + diff --git a/modules/blocklayered/fr.php b/modules/blocklayered/fr.php index 9726011cd..03cd78764 100644 --- a/modules/blocklayered/fr.php +++ b/modules/blocklayered/fr.php @@ -61,6 +61,7 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_f72c75bdf80dc88b2529162f4947edc $_MODULE['<{blocklayered}prestashop>blocklayered_64646db703ca003a37bd1e73977a3a4d'] = 'Catégories utilisant ce modèle'; $_MODULE['<{blocklayered}prestashop>blocklayered_d758a9754eb9f36db05c22ad0c77e38e'] = 'Sélectionnez une ou plusieurs catégories utilisant ce modèle'; $_MODULE['<{blocklayered}prestashop>blocklayered_5965d2ce192837f00d743d8a674382c1'] = 'Cliquez sur \"Sauvegarder cette sélection\" ou fermez la fenêtre pour sauvegarder'; +$_MODULE['<{blocklayered}prestashop>blocklayered_fa03eb688ad8aa1db593d33dabd89bad'] = 'Racine'; $_MODULE['<{blocklayered}prestashop>blocklayered_8cf04a9734132302f96da8e113e80ce5'] = 'Accueil'; $_MODULE['<{blocklayered}prestashop>blocklayered_b56c3bda503a8dc4be356edb0cc31793'] = 'Tout replier'; $_MODULE['<{blocklayered}prestashop>blocklayered_5ffd7a335dd836b3373f5ec570a58bdc'] = 'Tout étendre'; @@ -78,6 +79,7 @@ $_MODULE['<{blocklayered}prestashop>blocklayered_74a6a547d86659933a210680efb6e6d $_MODULE['<{blocklayered}prestashop>blocklayered_f8263d99054a4cdb3428196f078fa212'] = 'Nom du modèle :'; $_MODULE['<{blocklayered}prestashop>blocklayered_b96ce93c61b856a0163c116820646b19'] = 'Mon modèle'; $_MODULE['<{blocklayered}prestashop>blocklayered_5f514b580ea1b6bdb681916bc1deb207'] = 'uniquement pour le retrouver facilement'; +$_MODULE['<{blocklayered}prestashop>blocklayered_188185ae335eb523e53d6d31ede21f1c'] = 'Aucun filtre sélectionné, la navigation à facette sera désactivée pour les catégories concernées.'; $_MODULE['<{blocklayered}prestashop>blocklayered_ef1094d9826e98f5417e0a37f1742133'] = 'Sauvegarder ce modèle de filtres'; $_MODULE['<{blocklayered}prestashop>blocklayered_254f642527b45bc260048e30704edb39'] = 'Configuration'; $_MODULE['<{blocklayered}prestashop>blocklayered_054b4f3ea543c990f6b125f41af6ebf7'] = 'Option';