Merge pull request #2696 from jocel1/hotfix-filter-by-categories

[-] BO : Fix filter category tree issue
PrestaShop · Mar 18, 2015 · c61fb38 · c61fb38
2 parents 8db15ae + deaffea
commit c61fb38
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/admin-dev/themes/default/js/tree.js b/admin-dev/themes/default/js/tree.js
@@ -39,7 +39,7 @@ Tree.prototype =
 						var thatOne = $(this);
 						$.get(
 							'ajax-tab.php',
-							{controller:'AdminProducts',token:currentToken,action:'getCategoryTree',category:category},
+							{controller:'AdminProducts',token:currentToken,action:'getCategoryTree',type:idTree,category:category},
 							function(content)
 							{
 								thatOne.parent().closest('.tree-folder').find('ul.tree').html(content);

diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_categories.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_categories.tpl
@@ -33,6 +33,8 @@
 	</div>
 </div>
 <script type="text/javascript">
+	var currentToken="{$token|@addslashes}";
+	var idTree="{$id|escape:'html':'UTF-8'}";
 	{if isset($use_checkbox) && $use_checkbox == true}
 		function checkAllAssociatedCategories($tree)
 		{

diff --git a/admin-dev/themes/default/template/helpers/tree/tree_node_item_radio.tpl b/admin-dev/themes/default/template/helpers/tree/tree_node_item_radio.tpl
@@ -23,9 +23,9 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 <li class="tree-item{if isset($node['disabled']) && $node['disabled'] == true} tree-item-disable{/if}">
-	<label class="tree-item-name">
+	<span class="tree-item-name">
 		<input type="radio" name="{$input_name}" value="{$node['id_category']}"{if isset($node['disabled']) && $node['disabled'] == true} disabled="disabled"{/if} />
 		<i class="tree-dot"></i>
-		{$node['name']}
-	</label>
+		<label class="tree-toggler">{$node['name']}</label>
+	</span>
 </li>
diff --git a/classes/helper/HelperTreeCategories.php b/classes/helper/HelperTreeCategories.php
@@ -92,6 +92,15 @@ public function getData()
 				$selected_categories = $this->getSelectedCategories();
 				$categories[(int)$this->getRootCategory()] = Category::getChildren($this->getRootCategory(), $this->getLang(), false, $this->getShop()->id);
 				foreach($selected_categories as $selected_category)
+				{
+					$category = new Category($selected_category, $this->getLang(), $this->getShop()->id);
+					$new_selected_categories[] = $selected_category;
+					$parents = $category->getParentsCategories($this->getLang());
+					foreach($parents as $value)
+						$new_selected_categories[] = $value['id_category'];
+				}
+				$new_selected_categories = array_unique($new_selected_categories);
+				foreach($new_selected_categories as $selected_category)
 				{
 					$current_category = Category::getChildren($selected_category, $this->getLang(), false, $this->getShop()->id);
 					if (!empty($current_category))

diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
@@ -453,9 +453,14 @@ public function ajaxProcessGetCategoryTree()
 		$category = Tools::getValue('category', Category::getRootCategory()->id);
 		$fullTree = Tools::getValue('fullTree', 0);
 		$selected = Tools::getValue('selected', array());
+		$type = Tools::getValue('type', '');
+		if ($type == 'categories-tree')
+			$use_check_box = false;
+		else
+			$use_check_box = true;
 		$tree = new HelperTreeCategories('subtree_associated_categories');
 		$tree->setTemplate('subtree_associated_categories.tpl')
-			->setUseCheckBox(true)
+			->setUseCheckBox($use_check_box)
 			->setUseSearch(true)
 			->setSelectedCategories($selected)
 			->setFullTree($fullTree)
@@ -2432,6 +2437,7 @@ public function initContent($token = null)
 			$tree->setAttribute('is_category_filter', (bool)$this->id_current_category)
 				->setAttribute('base_url', preg_replace('#&id_category=[0-9]*#', '', self::$currentIndex).'&token='.$this->token)
 				->setInputName('id-category')
+				->setRootCategory(Configuration::get('PS_ROOT_CATEGORY'))
 				->setSelectedCategories(array((int)$id_category));
 			$this->tpl_list_vars['category_tree'] = $tree->render();