dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Modif after specs change

Browse Source
This commit is contained in:
Jerome Nadaud
2013-11-15 08:58:30 +01:00
parent 29f65da5ca
commit c2d956ec7d
2 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockcategories/blockcategories.php
+8 -27
View File
@@ -67,7 +67,6 @@ class BlockCategories extends Module
!$this->registerHook('actionAdminMetaControllerUpdate_optionsBefore') || !$this->registerHook('actionAdminMetaControllerUpdate_optionsBefore') ||
!$this->registerHook('actionAdminLanguagesControllerStatusBefore') || !$this->registerHook('actionAdminLanguagesControllerStatusBefore') ||
!$this->registerHook('displayBackOfficeCategory') || !$this->registerHook('displayBackOfficeCategory') ||
!$this->registerHook('displayTop') ||
!Configuration::updateValue('BLOCK_CATEG_MAX_DEPTH', 4) || !Configuration::updateValue('BLOCK_CATEG_MAX_DEPTH', 4) ||
!Configuration::updateValue('BLOCK_CATEG_DHTML', 1)) !Configuration::updateValue('BLOCK_CATEG_DHTML', 1))
return false; return false;
@@ -128,26 +127,15 @@ class BlockCategories extends Module
foreach ($resultParents[$id_category] as $subcat) foreach ($resultParents[$id_category] as $subcat)
$children[] = $this->getTree($resultParents, $resultIds, $maxDepth, $subcat['id_category'], $currentDepth + 1); $children[] = $this->getTree($resultParents, $resultIds, $maxDepth, $subcat['id_category'], $currentDepth + 1);
$category = new Category($id_category); if (!isset($resultIds[$id_category]))
$thumbnails = array(); return false;
if ($category->level_depth == 2)
{
$files = scandir(_PS_CAT_IMG_DIR_);
foreach ($files as $file)
if (preg_match('/'.$id_category.'-([0-9])?_thumb.jpg/i', $file) === 1)
$thumbnails[] = ImageManager::thumbnail(_PS_CAT_IMG_DIR_.$file, 'category_'.$file, 100, 'jpg', true, true);
}
$return = array( $return = array(
'id' => $id_category, 'id' => $id_category,
'link' => $this->context->link->getCategoryLink($id_category, $category->link_rewrite[(int)$this->context->language->id]), 'link' => $this->context->link->getCategoryLink($id_category, $resultIds[$id_category]['link_rewrite']),
'name' => $category->name[(int)$this->context->language->id], 'name' => $resultIds[$id_category]['name'],
'desc'=> $category->description[(int)$this->context->language->id], 'desc'=> $resultIds[$id_category]['description'],
'children' => $children, 'children' => $children
'thumbnails' => $thumbnails
); );
return $return; return $return;
@@ -179,13 +167,6 @@ class BlockCategories extends Module
return $this->display(__FILE__, 'views/blockcategories_admin.tpl'); return $this->display(__FILE__, 'views/blockcategories_admin.tpl');
} }
public function hookDisplayTop($params)
{
$params['is_top_menu'] = true;
$this->smarty->assign('numberColumn', 3);
return $this->hookLeftColumn($params);
}
public function hookLeftColumn($params) public function hookLeftColumn($params)
{ {
$category = false; $category = false;
@@ -202,7 +183,7 @@ class BlockCategories extends Module
} }
$cacheId = $this->getCacheId($category ? $category->id : null); $cacheId = $this->getCacheId($category ? $category->id : null);
if (!$this->isCached('blockcategories'.((isset($params['is_top_menu']) && $params['is_top_menu']) ? '_top' : '').'.tpl', $cacheId)) if (!$this->isCached('blockcategories.tpl', $cacheId))
{ {
$range = ''; $range = '';
$maxdepth = Configuration::get('BLOCK_CATEG_MAX_DEPTH'); $maxdepth = Configuration::get('BLOCK_CATEG_MAX_DEPTH');
@@ -248,7 +229,7 @@ class BlockCategories extends Module
else else
$this->smarty->assign('branche_tpl_path', _PS_MODULE_DIR_.'blockcategories/category-tree-branch.tpl'); $this->smarty->assign('branche_tpl_path', _PS_MODULE_DIR_.'blockcategories/category-tree-branch.tpl');
} }
return $this->display(__FILE__, 'blockcategories'.((isset($params['is_top_menu']) && $params['is_top_menu']) ? '_top' : '').'.tpl', $cacheId); return $this->display(__FILE__, 'blockcategories.tpl', $cacheId);
} }
protected function getCacheId($name = null) protected function getCacheId($name = null)
modules/blockcategories/upgrade/install-2.1.php
+1 -1
View File
@@ -5,5 +5,5 @@ if (!defined('_PS_VERSION_'))
function upgrade_module_2_1($object) function upgrade_module_2_1($object)
{ {
return ($object->registerHook('displayBackOfficeCategory') && $object->registerHook('displayTop')); return $object->registerHook('displayBackOfficeCategory');
} }